twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-27 07:04:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #257 from slr/tasty-interface-refactoring

Browse Source 
The Fastest In Town Orchestra. Mess-O-Rama Music Vol. 1: Living Through This
This commit is contained in:
miguelfreitas 2015-05-29 17:04:31 -03:00
commit d0a94033c9
22 changed files with 2002 additions and 2510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
css/profile.css
View File

@ -55,7 +55,7 @@
}
.profile-card-main h2
{
color: #fff;
color: #fff;
}
.profile-card-buttons
@ -137,7 +137,7 @@
.forEdition .profile-card-main input:focus,
.forEdition .profile-card-photo:hover
{
background: rgba( 0, 0, 0, .3 );
background: rgba( 0, 0, 0, .3 );
}
.input-description
{
@ -168,23 +168,18 @@
************ PROFILE MODAL ***********
**************************************/
.profile-modal .modal-wrapper
{
.modal-wrapper.profile-modal {
width: 580px;
border-radius: 5px;
overflow: hidden;
position: absolute;
top:5%;
height: 90%;
margin-left: -290px;
height: 760px;
margin: -380px 0 0 -290px;
}
}
.profile-modal .modal-content
{
padding: 3px;
height: 100%;
.profile-modal .modal-content {
height: 730px;
overflow-y: hidden;
padding: 3px;
}
#msngrswr {
display: none;
margin-top: 20px;
@ -255,18 +250,17 @@
.profile-modal .profile-bitmessage {
background: #e3e5ea url(../img/bm.png) center no-repeat;
}
.profile-modal .profile-data
{
.profile-modal .profile-data {
display: inline-block;
margin-left: -4px;
border-bottom: 0;
}
.profile-modal .postboard
{
.profile-modal .postboard {
margin-left: 0;
padding: 5px 0 5px 0;
height: 73%;
}
.profile-modal .postboard h2
{
width: auto;

392
css/style.css
View File

@ -23,8 +23,8 @@ b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video, textarea
{
@ -422,11 +422,11 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
}
.userMenu-search-sugestions
{
border-bottom: solid 1px rgba( 69, 71, 77, .1 );
border-bottom: solid 1px rgba( 69, 71, 77, .1 );
}
.userMenu-search-sugestions a
{
color: rgba( 0, 0, 0, .7 );
color: rgba( 0, 0, 0, .7 );
padding: 5px 20px;
font-size: 12px;
display: block;
@ -452,7 +452,7 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
{
font-size: 12px;
font-weight: bold;
color: rgba( 0, 0, 0, .7 );
color: rgba( 0, 0, 0, .7 );
padding: 0 75px 0 15px;
}
/***********************************
@ -486,7 +486,7 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
}
.following-list .mini-profile-name
{
padding: 5px 5px 5px 5px;
padding: 5px 5px 5px 5px;
}
.profile-data
{
@ -568,12 +568,12 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
}
.mini-profile-actions ul li + li
{
margin: 0 2px;
margin: 0 2px;
}
.mini-profile-actions:hover ul li:hover
{
background: rgba( 0, 0, 0, .7 );
color: #fff;
color: #fff;
}
.mini-profile-info a:hover
{
@ -896,11 +896,7 @@ ol.toptrends-list {
background: #e34f42;
width: 100%;
}
.postboard h2.fixed
{
z-index: 2;
border-top: solid 4px #fbf9f6;
}
.postboard-posts
{
position: relative;
@ -954,7 +950,7 @@ ol.toptrends-list {
}
.postboard-posts > .post:after
{
content: "";
content: "";
position: absolute;
right: 0;
top: 0;
@ -1388,55 +1384,49 @@ ol.toptrends-list {
************* POPUP MODAL ************
**************************************/
.modal-blackout
{
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
background: rgba( 0, 0, 0, .6 );
display: none;
.modal-wrapper {
background: #fff;
z-index: 3;
}
.modal-blackout.reply .post
{
background: #ececed;
padding: 10px 15px;
}
.modal-wrapper
{
position: fixed;
top: 50%;
left: 50%;
width: 580px;
border-radius: 5px;
height: 720px;
overflow: hidden;
position: absolute;
top:10%;
left: 50%;
height: 80%;
margin-left: -290px;
margin: -360px 0 0 -290px;
border-radius: 5px;
box-shadow: 10px 12px 18px 0px rgba(0,0,0, .3);
background: rgba( 255, 255,255, 1.0 );
z-index: 3;
}
.modal-content{
height: 100%;
.modal-header {
background: #e34f42;
position: relative;
height: 30px;
}
.modal-header h3 {
color: #fff;
padding: 5px 10px;
font-weight: bold;
}
.modal-wrapper .modal-content {
background: #fff;
height: 690px;
overflow-y: auto;
}
.modal-header
{
position: relative;
.modal-wrapper .modal-blackout {
background: rgba(0,0,0, .6);
z-index: -1;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.modal-header h3
{
padding: 5px 10px;
font-weight: bold;
background: #e34f42;
color: #fff;
}
.modal-close
{
.modal-close {
position: absolute;
right: 0;
top: 0;
@ -1445,13 +1435,14 @@ ol.toptrends-list {
color: rgba( 255, 255, 255, .7 );
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
transition: all .1s linear;
}
.modal-close:hover
{
.modal-close:hover {
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-back,
.mark-all-as-read {
position: absolute;
@ -1463,45 +1454,30 @@ ol.toptrends-list {
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
display: none;
display: none;
}
.modal-back:hover,
.mark-all-as-read:hover {
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-buttons
{
padding: 10px;
text-align: right;
}
.modal-buttons button:last-child
{
padding: 5px 20px;
.modal-wrapper.reply .post {
background: #ececed;
padding: 10px 15px;
}
/*************************************
****************** DIRECT MESSAGES MODAL
******** DIRECT MESSAGES MODAL *******
**************************************/
.directMessages .modal-wrapper
{
overflow-y: auto;
}
.directMessages .modal-content
{
height: auto;
}
.directMessages .modal-buttons
{
display: none;
}
.direct-messages-list .post
{
.direct-messages-list .post {
padding: 10px 30px 10px 15px;
cursor: pointer;
}
.direct-messages-list .post:after
{
.direct-messages-list .post:after {
content: "►";
position: absolute;
right: 10px;
@ -1509,48 +1485,48 @@ ol.toptrends-list {
margin: -6px 0 0 0;
color: rgba( 0, 0, 0, .4 );
}
.direct-messages-thread
{
.direct-messages-thread {
padding: 10px;
}
.direct-messages-thread .post
{
.direct-messages-thread .post {
min-height: 82px;
margin-left: 65px;
}
.direct-messages-thread .post:after,
.direct-messages-thread .post:nth-child(2n):after
{
.direct-messages-thread .post:nth-child(2n):after {
content: "";
width: 1px;
background: transparent;
position: absolute;
top: 25px;
}
.direct-messages-thread .post:after
{
.direct-messages-thread .post:after {
border-top: solid 10px transparent;
border-bottom: solid 10px transparent;
border-right: solid 10px #ececed;
left: -10px;
}
.direct-messages-thread .post-text
{
.direct-messages-thread .post-text {
margin: 2px 10px 4px 4px;
word-wrap: break-word;
}
.direct-messages-thread .post-photo
{
.direct-messages-thread .post-photo {
position: absolute;
left: -65px;
}
.direct-messages-thread .post.sent
{
.direct-messages-thread .post.sent {
margin-right: 60px;
margin-left: 0;
}
.direct-messages-thread .post.sent:after
{
.direct-messages-thread .post.sent:after {
border-top: solid 10px transparent;
border-bottom: solid 10px transparent;
border-right: none;
@ -1558,186 +1534,174 @@ ol.toptrends-list {
right: -10px;
left: auto;
}
.direct-messages-thread .post.sent .post-text
{
.direct-messages-thread .post.sent .post-text {
margin: 2px 10px 4px 4px;
}
.direct-messages-thread .post.sent .post-photo
{
.direct-messages-thread .post.sent .post-photo {
position: absolute;
right: -65px;
left: auto;
}
.mark-all-as-read {
right: 60px;
}
.mark-all-as-read:before {
content: '\2714';
}
/*************************************
****************** NEW USER MODAL
*********** NEW USER MODAL ***********
**************************************/
.new-user .modal-wrapper
{
top: 50%;
.new-user.modal-wrapper {
width: 720px;
height: 400px;
margin: -200px 0 0 -360px;
overflow-x: hidden;
overflow-y: hidden;
height: 580px;
margin: -290px 0 0 -360px;
}
.new-user .modal-content
{
margin: 10px 10px 10px 10px;
.new-user .modal-content {
height: 550px;
padding: 25px;
}
.new-user .modal-buttons,
.new-user .modal-close
{
.new-user .modal-close {
display: none;
}
.new-user .text
{
.new-user .text {
margin: 0 0 15px 0;
}
.new-user .emphasis
{
.new-user .emphasis {
font-size: 18px;
text-align: center;
}
.new-user .secret-key
{
color: rgba( .5, 0, 0, 1.0 );
.new-user .secret-key {
color: rgba(.5,0,0, 1.0);
font-weight: bold;
}
/*************************************
****************** HASHTAG MODAL
*************************************/
.hashtag-modal .modal-buttons
{
display: none;
}
.hashtag-modal .postboard
{
/*************************************
************ HASHTAG MODAL ***********
**************************************/
.hashtag-modal .postboard {
margin-left: 0;
}
/*************************************
****************** CONVERSATION MODAL
*************************************/
.conversation-modal .modal-buttons
{
display: none;
}
.conversation-modal .postboard
{
/*************************************
********* CONVERSATION MODAL *********
**************************************/
.conversation-modal .postboard {
margin-left: 0;
}
/*************************************
****************** FOLLOWING MODAL
************************************/
.following-modal .modal-buttons
{
display: none;
}
.following-modal ol
{
/*************************************
********** FOLLOWING MODAL ***********
**************************************/
.following-modal ol {
margin: 5px;
}
.following-modal .open-profile-modal:hover
{
.following-modal .open-profile-modal:hover {
text-decoration: none;
}
.following-modal .open-profile-modal img
{
.following-modal .open-profile-modal img {
float: none;
}
.following-modal .open-profile-modal span
{
.following-modal .open-profile-modal span {
vertical-align: middle;
}
.following-modal .open-profile-modal span:hover
{
.following-modal .open-profile-modal span:hover {
text-decoration: underline;
}
/*************************************
******************* WHO TO FOLLOW MODAL
*************************************/
.who-to-follow-modal .modal-buttons
{
display: none;
}
.who-to-follow-modal ol
{
********* WHO TO FOLLOW MODAL ********
**************************************/
.who-to-follow-modal ol {
margin: 5px;
}
.who-to-follow-modal .open-profile-modal:hover
{
.who-to-follow-modal .open-profile-modal:hover {
text-decoration: none;
}
.who-to-follow-modal .open-profile-modal span
{
.who-to-follow-modal .open-profile-modal span {
vertical-align: middle;
}
.who-to-follow-modal .open-profile-modal span:hover
{
.who-to-follow-modal .open-profile-modal span:hover {
text-decoration: underline;
}
.who-to-follow-modal .follow
{
.who-to-follow-modal .follow {
float: right;
margin: -30px 10px 0 10px;
}
.who-to-follow-modal .twister-user-info span
{
.who-to-follow-modal .twister-user-info span {
vertical-align: bottom;
}
.who-to-follow-modal .bio
{
.who-to-follow-modal .bio {
font-size: 12px;
color: rgba( 0, 0, 0, .6 );
}
/*************************************
****************** POPUP PROMPT ******
************ POPUP PROMPT ************
**************************************/
.prompt-wrapper
{
position: fixed;
top: 50%;
left: 50%;
.prompt-wrapper {
background: #fff;
z-index: 5;
position: fixed;
top: 50%;
left: 50%;
width: 600px;
margin-left: -300px;
box-shadow: 10px 12px 18px 0px rgba(0,0,0, .3);
z-index: 5;
width: 600px;
margin-left:-300px;
}
.prompt-wrapper .modal-header h3{
background: #E34F42;
.prompt-wrapper .modal-buttons {
padding: 10px;
text-align: right;
}
.prompt-wrapper .modal-buttons button:last-child {
padding: 5px 20px;
}
/*************************************
****** FOLLOWING-CONFIG PROMPT *******
**************************************/
.following-config-modal
{
.following-config-modal.prompt-wrapper {
margin-top: -80px;
}
.following-config-modal .modal-content
{
.following-config-modal .modal-content {
padding: 10px;
text-align: center;
}
.following-config-modal .modal-buttons
{
.following-config-modal .modal-buttons {
display: none;
}
.following-config-method-buttons
{
.following-config-method-buttons {
padding: 10px;
}
@ -1745,15 +1709,15 @@ ol.toptrends-list {
******** RETWIST POSTS PROMPT ********
**************************************/
.reTwist
{
.reTwist.prompt-wrapper {
margin-top: -100px;
}
.reTwist .post-expand,
.reTwist .post-interactions
{
.reTwist .post-interactions {
display: none;
}
.reTwist .post {
margin: 5px;
padding: 5px;
@ -1761,34 +1725,32 @@ ol.toptrends-list {
}
/*************************************
****************** REPLY POSTS PROMPT
********* REPLY POSTS PROMPT *********
**************************************/
.reply
{
.reply.prompt-wrapper {
margin-top: -140px;
}
.reply .modal-buttons
{
display: none;
}
.reply .post-expand,
.reply .post-interactions
{
.reply .modal-buttons {
display: none;
}
.reply .textcomplete-wrapper{
.reply .post-expand,
.reply .post-interactions {
display: none;
}
.reply .textcomplete-wrapper {
padding-top: 10px;
}
.reply .textcomplete-wrapper textarea{
.reply .textcomplete-wrapper textarea {
margin: 10px;
width: 580px;
}
.reply .post-area-extras
{
.reply .post-area-extras {
margin-right: 10px;
}

55
following.html
View File

@ -37,10 +37,8 @@
<link rel="icon" type="image/png" href="img/twister_mini.png" />
</head>
<body>
<!-- MENU SUPERIOR INIT -->
<!-- MENU SUPERIOR INIT -->
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
@ -78,7 +76,6 @@
<!-- BUSCA -->
<li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search"/>
<div class="search-results dialog-modal">
<ul class="userMenu-search-sugestions" style="display: none;">
<li><a href="#">Fulano</a></li>
@ -98,25 +95,17 @@
</li>
</ul>
</div>
</li>
</ul>
</nav>
<!-- MENU SUPERIOR END -->
<div class="wrapper">
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<div class="dashboard left">
<!-- PROFILE MODULE INIT -->
<div class="module mini-profile selectable_theme theme_nin">
<div class="mini-profile-info">
<!-- THEME NIN added user menu (mentions, messages and edit profile) -->
<ul class="mini-profile-indicators selectable_theme theme_nin">
<li class="userMenu-connections">
@ -129,8 +118,6 @@
<a href="profile-edit.html" title="Edit profile"><span>Edit profile</span></a>
</li>
</ul>
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name open-profile-modal"></a>
<span class="mini-profile-view">View</span>
@ -140,13 +127,11 @@
<li class="current"><a href="following.html" class="open-following-page"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#" class="open-followers"><span class="followers-count">&nbsp;</span><span class="label">Followers</span> *</a></li>
</ul>
</div>
<!-- PROFILE MODULE INIT -->
</div>
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<div class="following">
<h2 class="header-bold"> Following </h2>
@ -196,13 +181,10 @@
</div>
</div>
<!-- LADO ESQUERDO DE MÓDULOS END -->
</div>
<!-- TEMPLATES INIT -->
<div id="templates" style="display:none;">
<!-- TEMPLATE DE WHO-TO-FOLLOW SUGGESTION -->
<li id="follow-suggestion-template" class="twister-user">
<div class="">
@ -288,33 +270,25 @@
<!-- template for user links in message (open profile modal) -->
<a id="hashtag-link-template" class="open-hashtag-modal"></a>
<!-- template para ir dentro de avatar-row -->
<a id="avatar-row-template" class="open-profile-modal" href="">
<img class="size24" src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/>
<span class="user-name-tooltip"></span>
</a>
<li class="descendant module post">
</li>
<!-- TEMPLATE INVÓLUCRO DO POST EXPANDIDO END -->
<!-- TEMPLATE DO MODAL GENÉRICO INIT -->
<div class="modal-blackout cancel">
<div class="modal-wrapper">
<div class="modal-wrapper">
<div class="modal-header">
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back">&lt;</span>
<span class="mark-all-as-read"></span>
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back" onClick="history.back();">&lt;</span>
<span class="mark-all-as-read"></span>
</div>
<div class="modal-content"></div>
<div class="modal-buttons">
<button class="modal-cancel cancel">Cancel</button>
<button class="modal-propagate">Retransmit</button>
</div>
</div>
<div class="modal-blackout cancel"></div>
</div>
<!-- TEMPLATE DO MODAL GENÉRICO END -->
@ -371,7 +345,6 @@
<p class="post-text"></p>
</li>
<div class="messages-thread-template">
<ol class="direct-messages-thread">
<!-- use "dm-chat-template" here -->
@ -397,7 +370,6 @@
</div>
<!-- MODAL DE DIRECT MESSAGES INIT -->
<!-- MODAL DE PROFILE -->
<div id="profile-modal-template">
<!-- ÁREA DE PROFILE PHOTO INIT -->
@ -457,10 +429,8 @@
</div>
<!-- MODAL DE PROFILE END -->
<!-- MODAL DE HASHTAGS -->
<div id="hashtag-modal-template">
<!-- ÁREA DE POSTS INIT -->
<div class="postboard">
<h2>
@ -468,10 +438,8 @@
<!-- o botão de novas postagens deve ser ocultado quando o usuário clicá-lo via javascript -->
<button class="postboard-news" style="display:none;"></button>
</h2>
<ol id="profile-posts" class="postboard-posts">
</ol>
</div>
<!-- ÁREA DE POSTS END -->
</div>
@ -497,28 +465,23 @@
</div>
</li>
</ol>
<!-- ÁREA DE FOLLOWERS END -->
</div>
<!-- MODAL DE FOLLOWING END -->
<!-- MODAL OF FOLLOWING CONFIG -->
<div id="following-config-modal-template">
<!-- ÁREA OF FOLLOWING METHOD -->
<div class="following-config-modal-content" data-screen-name="">
<h2><span class="following-config-method-message">Which way do you want to follow</span> <span class="following-screen-name">@<b></b></span>:</h2>
<div class="following-config-method-buttons">
<button class="public-following">Public</button>
<button class="public-following private">Private</button>
</div>
</div>
<!-- ÁREA OF FOLLOWING METHOD END -->
</div>
<!-- MODAL OF FOLLOWING CONFIG END -->
</div>
<!-- TEMPLATES END -->

66
home.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8"/>
<title>Twister</title>
<title>twister</title>
<link id="stylecss" rel="stylesheet" href="css/style.css" type="text/css"/>
<link id="profilecss" rel="stylesheet" href="css/profile.css" type="text/css"/>
<script src="js/jquery.min.js"></script>
@ -35,9 +35,7 @@
<link rel="icon" type="image/png" href="img/twister_mini.png" />
</head>
<body>
<!-- MENU SUPERIOR INIT -->
<nav class="userMenu">
<ul>
@ -80,7 +78,6 @@
<!-- BUSCA -->
<li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search"/>
<div class="search-results dialog-modal">
<ul class="userMenu-search-sugestions" style="display: none;">
<li><a href="#">Fulano</a></li>
@ -100,20 +97,14 @@
</li>
</ul>
</div>
</li>
</ul>
</nav>
<!-- MENU SUPERIOR END -->
<div class="wrapper">
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<div class="dashboard left">
<!-- PROFILE MODULE -->
<div class="module mini-profile">
<div class="mini-profile-info">
@ -153,14 +144,13 @@
</div>
<!-- WHO TO FOLLOW MODULE -->
<div class="module who-to-follow"></div>
<div class="module who-to-follow" style="display: none;"></div>
<!-- TOP TRENDS MODULE -->
<div class="module toptrends"></div>
<div class="module toptrends" style="display: none;"></div>
<!-- TWISTDAY REMINDER MODULE -->
<div class="module twistday-reminder"></div>
<div class="module twistday-reminder" style="display: none;"></div>
</div>
<!-- LADO ESQUERDO DE MÓDULOS END -->
@ -193,24 +183,20 @@
</div>
<!-- END postboard-top -->
<ol id="posts" class="postboard-posts">
<!-- use "post-template" here -->
</ol>
<div class="postboard-loading" style="display: none;">
<div></div>
</div>
</div>
<!-- ÁREA DE POSTS END -->
<div class="dashboard right"></div>
</div>
<!-- TEMPLATES INIT -->
<div id="templates" style="display:none;">
<!-- TEMPLATE DE WHO-TO-FOLLOW MODULE -->
<div id="who-to-follow-template">
<div>
@ -223,7 +209,7 @@
<!-- use "follow-suggestion-template" here -->
</ol>
</div>
<div class="loading-roller" style="display: none;">
<div class="loading-roller">
<div></div>
</div>
</div>
@ -236,7 +222,7 @@
<a class="refresh-toptrends">Refresh</a>
<ol class="toptrends-list"></ol>
</div>
<div class="loading-roller" style="display: none;">
<div class="loading-roller">
<div></div>
</div>
</div>
@ -260,7 +246,7 @@
</ol>
</div>
</div>
<div class="loading-roller" style="display: none;">
<div class="loading-roller">
<div></div>
</div>
</div>
@ -307,12 +293,12 @@
</div>
</li>
<!-- TEMPLATE DA OL INVÓLUCRO DAS LIST ELEMENTS DO POST EXPANDIDO INIT -->
<!-- TEMPLATE DA OL INVÓLUCRO DAS LIST ELEMENTS DO POST EXPANDIDO INIT -->
<ol class="expanded-post">
</ol>
<!-- TEMPLATE DA OL INVÓLUCRO DAS LIST ELEMENTS DO POST EXPANDIDO END -->
<!-- TEMPLATE DA OL INVÓLUCRO DAS LIST ELEMENTS DO POST EXPANDIDO END -->
<!-- TEMPLATE DOS 3 TIPOS DE LI DO POST EXPANDIDO INIT -->
<!-- TEMPLATE DOS 3 TIPOS DE LI DO POST EXPANDIDO INIT -->
<li class="ancestor module post">
</li>
@ -372,8 +358,6 @@
<!-- template for user links in message (open profile modal) -->
<a id="hashtag-link-template" class="open-hashtag-modal"></a>
<!-- template para ir dentro de avatar-row -->
<a id="avatar-row-template" class="open-profile-modal" href="">
<img class="size24" src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/>
@ -385,20 +369,15 @@
<!-- TEMPLATE INVÓLUCRO DO POST EXPANDIDO END -->
<!-- TEMPLATE DO MODAL GENÉRICO INIT -->
<div class="modal-blackout cancel">
<div class="modal-wrapper">
<div class="modal-wrapper">
<div class="modal-header">
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back" onClick="history.back();">&lt;</span>
<span class="mark-all-as-read"></span>
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back" onClick="history.back();">&lt;</span>
<span class="mark-all-as-read"></span>
</div>
<div class="modal-content"></div>
<div class="modal-buttons">
<button class="modal-cancel cancel">Cancel</button>
<button class="modal-propagate">Retransmit</button>
</div>
</div>
<div class="modal-blackout cancel"></div>
</div>
<!-- TEMPLATE DO MODAL GENÉRICO END -->
@ -455,7 +434,6 @@
<p class="post-text"></p>
</li>
<div class="messages-thread-template">
<ol class="direct-messages-thread">
<!-- use "dm-chat-template" here -->
@ -481,7 +459,6 @@
</div>
<!-- MODAL DE DIRECT MESSAGES INIT -->
<!-- MODAL DE PROFILE -->
<div id="profile-modal-template">
<!-- ÁREA DE PROFILE PHOTO INIT -->
@ -532,19 +509,15 @@
<!-- o botão de novas postagens deve ser ocultado quando o usuário clicá-lo via javascript -->
<button class="postboard-news" style="display:none;"></button>
</h2>
<ol id="profile-posts" class="postboard-posts">
</ol>
</div>
<!-- ÁREA DE POSTS END -->
</div>
<!-- MODAL DE PROFILE END -->
<!-- MODAL DE HASHTAGS -->
<div id="hashtag-modal-template">
<!-- ÁREA DE POSTS INIT -->
<div class="postboard">
<h2>
@ -552,10 +525,8 @@
<!-- o botão de novas postagens deve ser ocultado quando o usuário clicá-lo via javascript -->
<button class="postboard-news" style="display:none;"></button>
</h2>
<ol id="profile-posts" class="postboard-posts">
</ol>
<div class="postboard-loading" style="display: none;">
<div></div>
</div>
@ -584,28 +555,23 @@
</div>
</li>
</ol>
<!-- ÁREA DE FOLLOWERS END -->
</div>
<!-- MODAL DE FOLLOWING END -->
<!-- MODAL OF FOLLOWING CONFIG -->
<div id="following-config-modal-template">
<!-- ÁREA OF FOLLOWING METHOD -->
<div class="following-config-modal-content" data-screen-name="">
<h2><span class="following-config-method-message">Which way do you want to follow</span> <span class="following-screen-name">@<b></b></span>:</h2>
<div class="following-config-method-buttons">
<button class="public-following">Public</button>
<button class="public-following private">Private</button>
</div>
</div>
<!-- ÁREA OF FOLLOWING METHOD END -->
</div>
<!-- MODAL OF FOLLOWING CONFIG END -->
</div>
<!-- TEMPLATES END -->

1709
js/interface_common.js
View File

File diff suppressed because it is too large Load Diff

226
js/interface_home.js
View File

@ -46,8 +46,7 @@ var InterfaceFunctions = function() {
//$("span.screen-name").text('@' + user);
var $miniProfile = $(".mini-profile");
if(!defaultScreenName)
{
if (!defaultScreenName) {
$(".userMenu-profile > a").text(polyglot.t("Login"));
$(".userMenu-profile > a").attr("href","login.html");
$(".post-area-new > textarea").attr("placeholder",polyglot.t("You have to log in to post messages."));
@ -64,9 +63,7 @@ var InterfaceFunctions = function() {
$(".dropdown-menu-following").attr("href","#");
$(".dropdown-menu-following").bind("click", function()
{ alert(polyglot.t("You are not following anyone because you are not logged in."))} );
}
else
{
} else {
$miniProfile.find("a.mini-profile-name").attr("href",$.MAL.userUrl(defaultScreenName));
$miniProfile.find("a.open-profile-modal").attr("href",$.MAL.userUrl(defaultScreenName));
$miniProfile.find(".mini-profile-name").text(defaultScreenName);
@ -80,7 +77,7 @@ var InterfaceFunctions = function() {
loadFollowing( function(args) {
$(".mini-profile .following-count").text(followingUsers.length-1);
requestLastHave();
setInterval("requestLastHave()", 1000);
setInterval(requestLastHave, 1000);
initMentionsCount();
initDMsCount();
requestTimelineUpdate("latestFirstTime",postsPerRefresh,followingUsers,promotedPostsOnly);
@ -101,33 +98,40 @@ var InterfaceFunctions = function() {
}, {cbFunc:cbFunc, cbArg:cbArg});
$(window)
.on("eventFollow", function(e, user) {
$(".following-count").text(followingUsers.length-1);
setTimeout('requestTimelineUpdate("latest",postsPerRefresh,["'+user+'"],promotedPostsOnly)', 1000);
.on('eventFollow', function(e, user) {
$('.mini-profile .following-count').text(followingUsers.length - 1);
setTimeout(requestTimelineUpdate, 1000, 'latest', postsPerRefresh, [user], promotedPostsOnly);
})
.on("eventUnfollow", function(e, user) {
$(".following-count").text(followingUsers.length-1);
.on('eventUnfollow', function(e, user) {
$('.mini-profile .following-count').text(followingUsers.length - 1);
$('.wrapper .postboard .post').each( function() {
if (($(this).find('[data-screen-name="'+user+'"]').length && !$(this).find(".post-retransmited-by").text())
|| $(this).find(".post-retransmited-by").text() == '@'+user)
$( this ).remove();
var elem = $(this);
if ((elem.find('[data-screen-name="' + user + '"]').length && !elem.find(".post-retransmited-by").text())
|| elem.find(".post-retransmited-by").text() === '@'+user)
elem.remove();
});
});
if ($.Options.WhoToFollow.val === 'enable')
initWhoToFollow();
else
killInterfaceModule('who-to-follow');
if ($.Options.TwistdayReminder.val === 'enable')
initTwistdayReminder();
else
killInterfaceModule('twistday-reminder');
}
if ($.Options.TopTrends.val === 'enable')
initTopTrends();
else
killInterfaceModule('toptrends');
if ($.Options.TwistdayReminder.val === 'enable')
initTwistdayReminder();
else
killInterfaceModule('twistday-reminder');
}
}
function initTopTrends() {
var $tt = initInterfaceModule('toptrends');
if ($tt.length) {
var $ttRefresh = $tt.find('.refresh-toptrends');
$ttRefresh.on('click', updateTrendingHashtags);
@ -138,6 +142,7 @@ function initTopTrends() {
function updateTrendingHashtags() {
var $module = $('.module.toptrends');
var $list = $module.find('.toptrends-list');
if ($list.length) {
$list.empty().hide();
$module.find('.refresh-toptrends').hide();
@ -183,8 +188,35 @@ function updateTrendingHashtags() {
}
}
function initWhoToFollow() {
var wtf = initInterfaceModule('who-to-follow');
if (wtf.length) {
var wtfRefresh = wtf.find('.refresh-users');
wtfRefresh.on('click', refreshWhoToFollow);
setTimeout(function() {wtfRefresh.click();}, 100);
//wtf.find('.view-all-users').on('click', function() {window.location.hash = '#whotofollow';});
}
}
function refreshWhoToFollow() {
var module = $('.module.who-to-follow');
var list = module.find('.follow-suggestions');
if (list.length) {
list.empty().hide();
module.find('.refresh-users').hide();
module.find('.loading-roller').show();
getRandomFollowSuggestion();
getRandomFollowSuggestion();
getRandomFollowSuggestion();
}
}
function initTwistdayReminder() {
var $module = initInterfaceModule('twistday-reminder');
if ($module.length) {
var $moduleRefresh = $module.find('.refresh');
$moduleRefresh.on('click', refreshTwistdayReminder);
@ -195,91 +227,92 @@ function initTwistdayReminder() {
}
function refreshTwistdayReminder() {
var $module = $('.module.twistday-reminder');
var $list = $module.find('.list');
if ($list.length) {
$module.find('.refresh').hide();
$module.find('.loading-roller').show();
if (defaultScreenName && typeof(followingUsers) !== 'undefined') {
var suggests = followingUsers.slice();
if (suggests.length > 0) {
for (var i = 0; i < suggests.length; i++) {
suggests[i] = {'username': suggests[i], 'max_id': 0};
}
twisterRpc('getposts', [suggests.length + 1,suggests],
function(arg, posts) {
function addLuckyToList(list, post, time) {
var lucky = post.userpost.n;
if (list.find('[data-screen-name='+lucky+']').length < 1) {
var item = $('#twistday-reminder-suggestion-template').clone(true);
item.removeAttr('id');
item.find('.twister-user-info').attr('data-screen-name', lucky);
item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
item.find('.twister-user-tag').text('@' +lucky);
itemTwisterday = item.find('.twisterday');
itemTwisterday.bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
if (typeof(time) !== 'undefined')
itemTwisterday.text(timeGmtToText(time));
else
itemTwisterday.text(timeGmtToText(post.userpost.time));
var module = $('.module.twistday-reminder');
var list = module.find('.list');
getAvatar(lucky, item.find('.twister-user-photo'));
getFullname(lucky, item.find('.twister-user-full'));
if (list.length) {
module.find('.refresh').hide();
module.find('.loading-roller').show();
if (defaultScreenName && typeof followingUsers !== 'undefined' && followingUsers.length) {
var suggests = [];
for (var i = 0; i < followingUsers.length; i++) {
suggests[i] = {username: followingUsers[i], max_id: 0};
}
twisterRpc('getposts', [suggests.length + 1, suggests],
function(arg, posts) {
function addLuckyToList(list, post, time) {
var lucky = post.userpost.n;
if (!list.find('[data-screen-name=' + lucky + ']').length) {
var item = $('#twistday-reminder-suggestion-template').clone(true)
.removeAttr('id');
item.find('.twister-user-info').attr('data-screen-name', lucky);
item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
item.find('.twister-user-tag').text('@' + lucky);
itemTwisterday = item.find('.twisterday');
itemTwisterday.on('click', (function(e) {replyInitPopup(e, post);}).bind(post));
if (typeof time !== 'undefined')
itemTwisterday.text(timeGmtToText(time));
else
itemTwisterday.text(timeGmtToText(post.userpost.time));
list.append(item);
}
}
function removeLuckyFromList(list, lucky) {
list.find('[data-screen-name='+lucky+']').closest('li').remove();
getAvatar(lucky, item.find('.twister-user-photo'));
getFullname(lucky, item.find('.twister-user-full'));
list.append(item);
}
}
function removeLuckyFromList(list, lucky) {
list.find('[data-screen-name=' + lucky + ']').closest('li').remove();
}
var showUpcomingTimer = ($.Options.TwistdayReminderShowUpcoming.val === 'enable') ? $.Options.TwistdayReminderShowUpcomingTimer.val * 3600 : 0;
var listCurrent = $module.find('.current .list');
var listUpcoming = $module.find('.upcoming .list');
var d = new Date();
var todayYear = d.getUTCFullYear();
var todayMonth = d.getUTCMonth();
var todayDate = d.getUTCDate();
var todaySec = Date.UTC(todayYear,todayMonth,todayDate,d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
var thatSec;
var showUpcomingTimer = ($.Options.TwistdayReminderShowUpcoming.val === 'enable') ?
$.Options.TwistdayReminderShowUpcomingTimer.val * 3600 : 0;
var listCurrent = module.find('.current .list');
var listUpcoming = module.find('.upcoming .list');
var d = new Date();
var todayYear = d.getUTCFullYear();
var todayMonth = d.getUTCMonth();
var todayDate = d.getUTCDate();
var todaySec = Date.UTC(todayYear, todayMonth, todayDate,
d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds()) /1000;
var thatSec;
posts.sort(function(a,b) {
return (parseInt(a.userpost.time) > parseInt(b.userpost.time)) ? 1 : -1;
});
posts.sort(function(a, b) {
return (parseInt(a.userpost.time) > parseInt(b.userpost.time)) ? 1 : -1;
});
for (var i = 0; i < posts.length; i++) {
if (followingUsers.indexOf(posts[i].userpost.n) > -1) {
d.setTime(0);
d.setUTCSeconds(posts[i].userpost.time);
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
addLuckyToList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} else if (showUpcomingTimer > 0) {
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
d.setTime(0);
d.setUTCSeconds(thatSec);
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
} else {
removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
}
for (var i = 0; i < posts.length; i++) {
if (followingUsers.indexOf(posts[i].userpost.n) > -1) {
d.setTime(0);
d.setUTCSeconds(posts[i].userpost.time);
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
addLuckyToList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} else if (showUpcomingTimer > 0) {
thatSec = Date.UTC(todayYear, d.getUTCMonth(), d.getUTCDate(),
d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds()) /1000;
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
d.setTime(0);
d.setUTCSeconds(thatSec);
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
} else {
removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
}
} else {
removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
}
}
}
if (listCurrent.children().length)
listCurrent.parent().show();
if (listUpcoming.children().length)
listUpcoming.parent().show();
$module.find('.refresh').show();
$module.find('.loading-roller').hide();
}, null,
function(arg, ret) { console.log('ajax error:' + ret); }, null);
}
listCurrent.parent().css('display', listCurrent.children().length ? 'block' : 'none')
listUpcoming.parent().css('display', listUpcoming.children().length ? 'block' : 'none')
module.find('.refresh').show();
module.find('.loading-roller').hide();
}, null,
function(arg, ret) {console.log('ajax error:' + ret);}, null
);
}
if ($.Options.TwistdayReminderAutoUpdate.val === 'enable' && $.Options.TwistdayReminderAutoUpdateTimer.val > 0)
setTimeout(refreshTwistdayReminder, $.Options.TwistdayReminderAutoUpdateTimer.val * 1000);
@ -291,14 +324,3 @@ function refreshTwistdayReminder() {
//***********************************************
var interfaceFunctions = new InterfaceFunctions;
$( document ).ready( interfaceFunctions.init );
//função no window que fixa o header das postagens
function fixDiv()
{
var $cache = $('.postboard h2');
if ($(window).scrollTop() > 26)
$cache.addClass( "fixed" );
else
$cache.removeClass( "fixed" );
}
$(window).scroll(fixDiv);

15
js/interface_localization.js
View File

@ -51,6 +51,7 @@ if(preferredLanguage == "en"){
"Detailed information": "Detailed information",
"DHT network down.": "DHT network down.",
"Direct Messages": "Direct Messages",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "Disable",
"Display mentions to @": "Display mentions to @",
"Display retransmissions": "Display retransmissions",
@ -339,6 +340,7 @@ if(preferredLanguage == "es"){
"Detailed information": "Información detallada",
"DHT network down.": "Red DHT caida.",
"Direct Messages": "Mensajes directos",
"direct_messages_with": "Mensajes directos con %{username}",
"Disable": "Inhabilitar",
"Display mentions to @": "Visualización de menciones a @",
"Display retransmissions": "Visualización de retransmisiones",
@ -611,6 +613,7 @@ if(preferredLanguage == "uk"){
"Detailed information": "Детальна інформація",
"DHT network down.": "Мережа DHT недоступна.",
"Direct Messages": "Особисті повідомлення",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "Вимкнено",
"Display mentions to @": "Показати сповіщення @",
"Display retransmissions": "Показати пересилання",
@ -882,6 +885,7 @@ if(preferredLanguage == "zh-CN"){
"Detailed information": "详细信息",
"DHT network down.": "DHT网络中断。",
"Direct Messages": "私信",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "关闭",
"Display mentions to @": "显示@",
"Display retransmissions": "显示转发",
@ -1170,6 +1174,7 @@ if(preferredLanguage == "nl"){
"Detailed information": "Gedetailleerde informatie",
"DHT network down.": "DHT netwerk down.",
"Direct Messages": "Privéberichten",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "Uitschakelen",
"Display mentions to @": "Toon vermeldingen voor @",
"Display retransmissions": "Toon retransmissions",
@ -1442,6 +1447,7 @@ if(preferredLanguage == "it"){
"Detailed information": "Informazioni dettagliate",
"DHT network down.": "DHT network inaccessibile.",
"Direct Messages": "Messaggi Diretti",
"direct_messages_with": "Messaggi Diretti come %{username}",
"Disable": "Disabilitato",
"Display mentions to @": "Mostra le menzioni di @",
"Display retransmissions": "Mostra Ripubblicazioni",
@ -1711,6 +1717,7 @@ if(preferredLanguage == "fr"){
"Detailed information": "Informations détaillées",
"DHT network down.": "Panne du réseau DHT.",
"Direct Messages": "Messages privés",
"direct_messages_with": "Messages privés avec %{username}",
"Disable": "Désactiver",
"Display mentions to @": "Afficher les mentions pour @",
"Display retransmissions": "Afficher les retransmissions",
@ -1985,6 +1992,7 @@ if(preferredLanguage == "ru"){
"Detailed information": "Подробная информация",
"DHT network down.": "Недоступна DHT сеть.",
"Direct Messages": "Личные сообщения",
"direct_messages_with": "Личная переписка с %{username}",
"Disable": "Отключено",
"Display mentions to @": "Показать ответы для @",
"Display retransmissions": "Показать репосты",
@ -2262,6 +2270,7 @@ if(preferredLanguage == "de"){
"Detailed information": "Detaillierte Informationen",
"DHT network down.": "DHT-Netzwerk nicht verfügbar.",
"Direct Messages": "Direktnachrichten",
"direct_messages_with": "Direktnachrichten mit %{username}",
"Disable": "Deaktivieren",
"Display mentions to @": "Zeige Erwähnungen von @", //Ist das richtig? Ich weiß nicht, in welchem Zusammenhang das benutzt wird.
"Display retransmissions": "Weiterleitungen anzeigen",
@ -2535,6 +2544,7 @@ if(preferredLanguage == "ja"){
"Detailed information": "詳細",
"DHT network down.": "DHTネットワークがダウンしています",
"Direct Messages": "ダイレクトメッセージ",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "停止",
"Display mentions to @": "メンションを表示する",
"Display retransmissions": "リトランスミットを表示する",
@ -2804,7 +2814,8 @@ if(preferredLanguage == "pt-BR"){
"days": "%{smart_count} dia |||| %{smart_count} dias",
"Detailed information": "Informações detalhadas",
"DHT network down.": "Falha na rede DHT",
"Direct Messages": "Mensagens Diretas", // Layout issue: need to enlarge width of the button in Profile page.
"Direct Messages": "Mensagens Diretas",
"direct_messages_with": "Mensagens Diretas com %{username}",
"Disable": "Desabilitado",
"Display mentions to @": "Exibir menções a @",
"Display retransmissions": "Exibir retransmissões",
@ -3079,6 +3090,7 @@ if(preferredLanguage == "tr"){
"Detailed information": "Detaylı bilgi",
"DHT network down.": "DHT ağı çalışmıyor.",
"Direct Messages": "Direk Mesajlar",
"direct_messages_with": "%{username} ile Direk Mesajlar",
"Disable": "Kullanılmaz",
"Display mentions to @": "@ adının geçtiği gönderiler",
"Display retransmissions": "Tekrar iletimleri göster",
@ -3350,6 +3362,7 @@ if(preferredLanguage == "cs"){
"Detailed information": "Podrobné informace",
"DHT network down.": "Síť DHT je nedostupná.",
"Direct Messages": "Přímé zprávy",
"direct_messages_with": "Direct messages with %{username}",
"Disable": "Vypnuto",
"Display mentions to @": "Zobrazit zmínky o @",
"Display retransmissions": "Zobrazit přeposlané",

24
js/interface_login.js
View File

@ -1,27 +1,19 @@
// interface_login.js
// 2013 Miguel Freitas
function processCreateUser(username, secretKey) {
defaultScreenName = username;
if(defaultScreenName) {
if (defaultScreenName)
saveScreenName();
}
var newUserClass = "new-user";
openModal( newUserClass );
openModal({
classAdd: 'new-user',
content: $('#new-user-modal-template').children().clone(true),
title: polyglot.t('propagating_nickname', {username: username})
})
.content.find('.secret-key').text(secretKey);
//título do modal
$( "." + newUserClass + " h3" ).text( polyglot.t("propagating_nickname", { username: username }) );
var modalContent = $("." + newUserClass + " .modal-content");
var templateContent = $( "#new-user-modal-template" ).children().clone(true);
templateContent.appendTo(modalContent);
$( "." + newUserClass + " .secret-key" ).text(secretKey);
sendNewUserTransaction( username, processSendnewusertransaction );
sendNewUserTransaction(username, processSendnewusertransaction);
}
function processSendnewusertransaction() {

23
js/jQueryPlugins.js
View File

@ -1,3 +1,23 @@
// following replacement of the native setTimeout() and setInterval()
// enables the passage of the 'this' object through the JavaScript timers
// and enables the HTML5 standard passage of arbitrary arguments to the
// callback functions of timers in IE9 and other old browsers (like some of mobile ones).
// see https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers/setTimeout#A_possible_solution
var __nativeST__ = window.setTimeout, __nativeSI__ = window.setInterval;
window.setTimeout = function (vCallback, nDelay) { // additional arguments will be passed
var oThis = this, aArgs = Array.prototype.slice.call(arguments, 2);
return __nativeST__(vCallback instanceof Function ?
function () {vCallback.apply(oThis, aArgs);} : vCallback, nDelay);
};
window.setInterval = function (vCallback, nDelay) { // additional arguments will be passed
var oThis = this, aArgs = Array.prototype.slice.call(arguments, 2);
return __nativeSI__(vCallback instanceof Function ?
function () {vCallback.apply(oThis, aArgs);} : vCallback, nDelay);
};
// bind callback function for event of clicking outside of element
(function(jQuery) {
jQuery.fn.clickoutside = function(callback) {
var outside = 1, self = $(this);
@ -13,10 +33,11 @@
}
})(jQuery);
// get caret position
(function($) {
$.fn.caret = function(pos) {
var target = this[0];
var isContentEditable = target.contentEditable === 'true';
var isContentEditable = target.contentEditable === 'true';
//get
if (arguments.length == 0) {
//HTML5

2
js/options.js
View File

@ -350,4 +350,4 @@ function checkForNumeric(elem) {
$(elem).next('span').text(polyglot.t('only positive numbers!'));
return false;
}
};
}

16
js/tmobile.js
View File

@ -55,7 +55,7 @@ function initializeTwister( redirectNetwork, redirectLogin, cbFunc, cbArg ) {
initMentionsCount();
initDMsCount();
twisterFollowingO = TwisterFollowing(defaultScreenName);
twisterInitialized = true;
if( cbFunc )
cbFunc(cbArg);
@ -282,7 +282,7 @@ var router=new $.mobile.Router(
$("#dmchat textarea").val("");
dmConvo.html("");
installDMSendClick();
$.mobile.showPageLoadingMsg();
dmChatUser = user;
requestDmConversation(dmConvo,user);
@ -302,7 +302,7 @@ var router=new $.mobile.Router(
},
}, {
defaultHandler: function(type, ui, page) {
console.log("Default handler called due to unknown route ("
console.log("Default handler called due to unknown route ("
+ type + ", " + ui + ", " + page + ")" );
console.log(ui);
console.log(page);
@ -325,8 +325,8 @@ function installPostboardClick() {
$(".post a").unbind('click').click(function(e) {
e.stopPropagation();
// stopPropagation is supposed to be enough, but in Android the
// stopPropagation is supposed to be enough, but in Android the
// default action is not called so we reimplement it here as a hack.
e.preventDefault();
$.mobile.showPageLoadingMsg();
@ -419,7 +419,7 @@ function installRetransmitConfirmClick() {
function installCreateUserClick() {
$( ".create-user").unbind('click').click( function(e) {
createUserClick( function(username, secretKey) {
createUserClick( function(username, secretKey) {
defaultScreenName = username;
if(defaultScreenName) {
saveScreenName();
@ -439,7 +439,7 @@ function installUserSearchHandler() {
function installProfileEditHandlers() {
$(".profile-card-photo.forEdition").click( function() { $('#avatar-file').click(); } );
$("#avatar-file").bind( "change", handleAvatarFileSelectMobile);
$(".submit-changes").click( function() {
$(".submit-changes").click( function() {
saveProfile();
setTimeout( function() {$.MAL.goHome();}, 1000);
} );
@ -515,7 +515,7 @@ function encode_utf8(s) {
var ua = navigator.userAgent;
if( ua.indexOf("Android") >= 0 )
{
var androidversion = parseFloat(ua.slice(ua.indexOf("Android")+8));
var androidversion = parseFloat(ua.slice(ua.indexOf("Android")+8));
if (androidversion < 3.0)
{
return unescape(encodeURIComponent(s));

19
js/twister_actions.js
View File

@ -159,7 +159,7 @@ function requestPost(containerToAppend,username,resource,cbFunc,cbArgs){
function(args, postFromJson) {
if( postFromJson ) {
console.log(postFromJson);
//console.log(postFromJson);
appendPostToContainer(postFromJson,args.containerToAppend);
@ -318,23 +318,18 @@ function updateProfilePosts(postsView, username, useGetposts) {
});
}
function updateFollowingData(followingModalContent, username) {
followingModalContent.find(".following-screen-name b").text(username);
loadFollowingIntoList( username, $(followingModalContent[1]) );
}
function clearHashtagProcessed() {
_hashtagProcessedMap = {};
_hashtagPendingPosts = [];
}
function requestHashtag(postboard,hashtag,resource, timeoutArgs) {
function requestHashtag(postboard, hashtag, resource, timeoutArgs) {
postboard.closest("div").find(".postboard-loading").show();
dhtget( hashtag, resource, "m",
function(args, data) {
processHashtag(args.postboard, args.hashtag, data);
}, {postboard:postboard,hashtag:hashtag},
timeoutArgs);
dhtget(hashtag, resource, "m",
function(args, data) {processHashtag(args.postboard, args.hashtag, data);},
{postboard:postboard,hashtag:hashtag},
timeoutArgs
);
}
function processHashtag(postboard, hashtag, data) {

278
js/twister_directmsg.js
View File

@ -5,216 +5,194 @@
function requestDMsnippetList(dmThreadList) {
var followList = [];
for( var i = 0; i < followingUsers.length; i++ ) {
for (var i = 0; i < followingUsers.length; i++)
followList.push({username:followingUsers[i]});
}
for( var i = 0; i < groupChatAliases.length; i++ ) {
for (var i = 0; i < groupChatAliases.length; i++)
followList.push({username:groupChatAliases[i]});
}
twisterRpc("getdirectmsgs", [defaultScreenName, 1, followList],
function(req, ret) {processDMsnippet(ret, dmThreadList);}, dmThreadList,
function(req, ret) {console.log("ajax error:" + ret);}, null);
twisterRpc('getdirectmsgs', [defaultScreenName, 1, followList],
function(req, ret) {processDMsnippet(ret, dmThreadList);}, dmThreadList,
function(req, ret) {console.log('ajax error:' + ret);}, null
);
}
function processDMsnippet(dmUsers, dmThreadList) {
dmThreadList.empty();
for( var u in dmUsers ) {
if( dmUsers.hasOwnProperty(u) ) {
// convert snipped to html and add it to date-sorted list
var dmItem = dmDataToSnippetItem(dmUsers[u][0], u);
var timeDmItem = parseInt(dmItem.attr("data-time"));
var existingItems = dmThreadList.children();
var j = 0;
for( j = 0; j < existingItems.length; j++) {
var streamItem = existingItems.eq(j);
var timeExisting = streamItem.attr("data-time");
if( timeExisting == undefined ||
timeDmItem > parseInt(timeExisting) ) {
// this post in stream is older, so post must be inserted above
streamItem.before(dmItem);
break;
}
}
if( j == existingItems.length ) {
dmThreadList.append(dmItem);
for (var u in dmUsers) {
// convert snipped to html and add it to date-sorted list
var dmItem = dmDataToSnippetItem(dmUsers[u][0], u);
var timeDmItem = parseInt(dmItem.attr('data-time'));
var existingItems = dmThreadList.children();
for (var j = 0; j < existingItems.length; j++) {
var streamItem = existingItems.eq(j);
var timeExisting = streamItem.attr('data-time');
if (typeof timeExisting === 'undefined' || timeDmItem > parseInt(timeExisting)) {
// this post in stream is older, so post must be inserted above
streamItem.before(dmItem);
break;
}
}
if (j === existingItems.length)
dmThreadList.append(dmItem);
}
$.MAL.dmThreadListLoaded();
}
function openDmConversation(dm_screenname, dmTitleName, dmConversation) {
if( dm_screenname.length && dm_screenname[0] === '*' )
getGroupChatName( dm_screenname, dmTitleName );
else
getFullname( dm_screenname, dmTitleName );
dmConversation.attr("data-dm-screen-name", dm_screenname);
var dmConvo = dmConversation.find(".direct-messages-thread");
dmConvo.empty();
requestDmConversationModal(dmConvo,dm_screenname);
function requestDmConversationModal(postboard, dm_screenname) {
if (postboard.is('html *')) {
requestDmConversation(postboard, dm_screenname);
setTimeout(requestDmConversationModal, 1000, postboard, dm_screenname);
}
}
function requestDmConversationModal(dmConvo,dm_screenname) {
if( dmConvo.parents(".modal-blackout").css("display") == 'none' )
return;
requestDmConversation(dmConvo,dm_screenname);
setTimeout( function() {requestDmConversationModal(dmConvo,dm_screenname);}, 1000);
}
function requestDmConversation(dmConvo,dm_screenname) {
function requestDmConversation(postboard, dm_screenname) {
var since_id = undefined;
var oldItems = dmConvo.children();
if( oldItems.length ) {
since_id = parseInt(oldItems.eq(oldItems.length-1).attr("data-id"));
}
var oldItems = postboard.children();
if (oldItems.length)
since_id = parseInt(oldItems.eq(oldItems.length - 1).attr('data-id'));
var userDmReq = [{username: dm_screenname}];
if (typeof since_id !== 'undefined')
userDmReq[0].since_id = since_id;
var userDmReq = [{username:dm_screenname}];
if( since_id != undefined ) userDmReq[0].since_id = since_id;
var count = 100;
twisterRpc("getdirectmsgs", [defaultScreenName,count,userDmReq],
function(args, ret) { processDmConversation(args.dmConvo, args.dmUser, ret); },
{dmConvo:dmConvo,dmUser:dm_screenname},
function(arg, ret) { var msg = ("message" in ret) ? ret.message : ret;
alert(polyglot.t("ajax_error", { error: msg })); }, null);
twisterRpc('getdirectmsgs', [defaultScreenName, count, userDmReq],
function(args, ret) {processDmConversation(args.postboard, args.dm_screenname, ret);},
{postboard: postboard, dm_screenname: dm_screenname},
function(arg, ret) {
var msg = (ret.message) ? ret.message : ret;
alert(polyglot.t('ajax_error', {error: msg}));
}, null
);
}
function processDmConversation(dmConvo, dm_screenname, dmData) {
function processDmConversation(postboard, dm_screenname, dmData) {
var lastId = undefined;
if(dm_screenname in dmData) {
if (dmData[dm_screenname]) {
var dmList = dmData[dm_screenname];
if( dmList.length ) {
for( var i = 0; i < dmList.length; i++) {;
var dmItem = dmDataToConversationItem(dmList[i],defaultScreenName,dm_screenname);
dmItem.attr("data-id",dmList[i].id);
dmConvo.append(dmItem);
if (dmList.length) {
for (var i = 0; i < dmList.length; i++) {
var dmItem = dmDataToConversationItem(dmList[i], defaultScreenName, dm_screenname)
.attr('data-id', dmList[i].id)
.appendTo(postboard)
;
lastId = dmList[i].id;
}
$.MAL.dmChatListLoaded(dmConvo);
$.MAL.dmChatListLoaded(postboard);
}
}
if( lastId != undefined ) {
if (typeof lastId !== 'undefined')
resetNewDMsCountForUser(dm_screenname, lastId);
}
}
function directMsgSubmit(e)
{
function directMsgSubmit(e) {
e.stopPropagation();
e.preventDefault();
var $this = $( this );
var $replyText = $this.closest(".post-area-new").find("textarea");
var $dmConversation = $(".directMessages");
var replyText = $(this).closest('.post-area-new').find('textarea');
newDirectMsg($replyText.val(), $dmConversation.attr("data-dm-screen-name"));
newDirectMsg(replyText.val(), $('.directMessages').attr('data-dm-screen-name'));
$replyText.val("");
replyText.val('');
}
function newDirectMsg(msg, dm_screenname) {
if( lastPostId != undefined ) {
var paramsOrig = [defaultScreenName, lastPostId + 1, dm_screenname, msg]
var paramsOpt = paramsOrig
var copySelf = ($.Options.dmCopySelf.val === 'enable')
if( copySelf && dm_screenname[0] !== '*' ) {
if (typeof lastPostId !== 'undefined') {
var paramsOrig = [defaultScreenName, lastPostId + 1, dm_screenname, msg];
var paramsOpt = paramsOrig;
var copySelf = $.Options.dmCopySelf.val === 'enable';
if (copySelf && dm_screenname[0] !== '*')
paramsOpt = paramsOrig.concat(true)
}
twisterRpc("newdirectmsg", paramsOpt,
function(arg, ret) {
incLastPostId();
if( arg.copySelf ) incLastPostId();
}, {copySelf:copySelf},
function(arg, ret) {
// fallback for older twisterd (error: no copy_self parameter)
twisterRpc("newdirectmsg", arg.paramsOrig,
function(arg, ret) { incLastPostId(); }, null,
function(arg, ret) {
var msg = ("message" in ret) ? ret.message : ret;
alert("Ajax error: " + msg);
}, null);
}, {paramsOrig:paramsOrig}
twisterRpc('newdirectmsg', paramsOpt,
function(arg, ret) {
incLastPostId();
if (arg.copySelf)
incLastPostId();
}, {copySelf: copySelf},
function(arg, ret) {
// fallback for older twisterd (error: no copy_self parameter)
twisterRpc('newdirectmsg', arg.paramsOrig,
function(arg, ret) {incLastPostId();}, null,
function(arg, ret) {
var msg = (ret.message) ? ret.message : ret;
alert('Ajax error: ' + msg);
}, null
);
}, {paramsOrig: paramsOrig}
);
} else {
alert(polyglot.t("Internal error: lastPostId unknown (following yourself may fix!)"));
}
} else
alert(polyglot.t('Internal error: lastPostId unknown (following yourself may fix!)'));
}
//dispara o modal de direct messages
function directMessagesPopup()
{
if(!defaultScreenName)
{
alert(polyglot.t("You have to log in to use direct messages."));
// dispara o modal de direct messages
function directMessagesPopup() {
if (!defaultScreenName) {
alert(polyglot.t('You have to log in to use direct messages.'));
return;
}
var directMessagesClass = "directMessages";
openModal( directMessagesClass );
var directMessagesContent = $( ".direct-messages-template" ).html();
$( directMessagesContent ).clone().appendTo( ".directMessages .modal-content" );
//título do modal
$( ".directMessages h3" ).text( polyglot.t("Direct Messages") );
requestDMsnippetList($(".directMessages").find(".direct-messages-list"));
$('.mark-all-as-read').css('display', 'inline');
$('.mark-all-as-read').attr('title', polyglot.t("Mark all as read"));
$('.mark-all-as-read').on('click', function() {
for (var k in _newDMsPerUser) {
_newDMsPerUser[k] = 0;
}
saveDMsToStorage();
$.MAL.updateNewDMsUI(getNewDMsCount());
modal = openModal({
classAdd: 'directMessages',
content: $('.direct-messages-template').children().clone(true),
title: polyglot.t('Direct Messages')
});
requestDMsnippetList(modal.content.find('.direct-messages-list'));
modal.self.find('.mark-all-as-read')
.css('display', 'inline')
.attr('title', polyglot.t('Mark all as read'))
.on('click', function() {
for (var user in _newDMsPerUser) {
_newDMsPerUser[user] = 0;
}
saveDMsToStorage();
$.MAL.updateNewDMsUI(getNewDMsCount());
})
;
}
function openDmWithUserModal(dm_screenname)
{
if(!defaultScreenName){
alert(polyglot.t("You have to log in to use direct messages."));
function openDmWithUserModal(dm_screenname) {
if (!defaultScreenName) {
alert(polyglot.t('You have to log in to use direct messages.'));
return;
}
var directMessagesClass = "directMessages";
openModal( directMessagesClass );
modal = openModal({
classAdd: 'directMessages',
content: $('.messages-thread-template').children().clone(true),
title: polyglot.t('direct_messages_with', {username: '<span>' + dm_screenname + '</span>'})
});
//para poder exibir a thread selecionada...
var retweetContent = $( ".messages-thread-template" ).html();
$( retweetContent ).clone().appendTo( ".directMessages .modal-content" ).hide().fadeIn( "fast" );
modal.self.attr('data-dm-screen-name', dm_screenname);
var dmTitle = $( ".directMessages h3" );
dmTitle.html(polyglot.t("Direct messages with") + " <span></span>");
dmTitle = dmTitle.find("span");
var dmConversation = $(".directMessages");
openDmConversation(dm_screenname, dmTitle, dmConversation);
if (dm_screenname.length && dm_screenname[0] === '*')
getGroupChatName(dm_screenname, modal.self.find('.modal-header h3 span'));
else
getFullname(dm_screenname, modal.self.find('.modal-header h3 span'));
var $dmForm = $( ".dm-form-template" ).children().clone(true);
$dmForm.addClass("open");
$dmForm.appendTo( ".directMessages .modal-wrapper" ).hide().fadeIn( "fast" );
requestDmConversationModal(modal.self.find('.direct-messages-thread').empty(), dm_screenname);
$('.dm-form-template').children().clone(true)
.addClass('open').appendTo(modal.content).fadeIn('fast');
}
function initInterfaceDirectMsg() {
$('.direct-messages').attr('href','#directmessages');
$('.userMenu-messages a').attr('href','#directmessages');
$( ".direct-messages" ).attr("href","#directmessages");
$( ".userMenu-messages a" ).attr("href","#directmessages");
$( "#dm-snippet-template" ).bind( "click", function(){
window.location.hash='#directmessages?user='+$(this).attr("data-dm-screen-name");
} );
$( ".dm-submit").click( directMsgSubmit );
$( ".direct-messages-with-user" ).bind( "click", function() {
window.location.hash='#directmessages?user='+$(this).closest("[data-screen-name]").attr("data-screen-name");
} );
$('#dm-snippet-template').on('click', function() {
window.location.hash = '#directmessages?user=' + $(this).attr('data-dm-screen-name');
});
$('.dm-submit').on('click', directMsgSubmit);
$('.direct-messages-with-user').on('click', function() {
window.location.hash = '#directmessages?user=' +
$(this).closest('[data-screen-name]').attr('data-screen-name');
});
}

213
js/twister_following.js
View File

@ -262,7 +262,7 @@ function loadFollowingIntoList( username, html_list ) {
html_list.html("");
$.each(following, function(i, following_user){
var following_user_li = $( "#following-by-user-template" ).children().clone(true);
// link follower to profile page
$(following_user_li.children()[0]).attr("data-screen-name", following_user);
$(following_user_li.children()[0]).attr("href", $.MAL.userUrl(following_user));
@ -385,10 +385,11 @@ function follow(user, publicFollow, cbFunc, cbArg) {
function unfollow(user, cbFunc, cbArg) {
//console.log('we are not following @'+user+' anymore');
var i = followingUsers.indexOf(user);
if( i >= 0 ) {
followingUsers.splice(i,1);
if (i >= 0) {
followingUsers.splice(i, 1);
twisterFollowingO.update(user);
$(window).trigger("eventUnfollow", user)
// FIXME also need to check list of pending posts to remove from there
$(window).trigger('eventUnfollow', user);
}
delete _isFollowPublic[user];
saveFollowing();
@ -421,51 +422,39 @@ function isPublicFollowing(user) {
// check if following list is empty
function followingEmptyOrMyself() {
if( followingUsers.length == 0 ||
followingUsers.length == 1 && followingUsers[0] == defaultScreenName )
return true;
else
return false;
return (!followingUsers.length || (followingUsers.length === 1 && followingUsers[0] === defaultScreenName))
}
// randomly choose a user we follow, get "following1" from him and them
// choose a suggestion from their list. this function could be way better, but
// that's about the simplest we may get to start with.
function getRandomFollowSuggestion(cbFunc, cbArg) {
if( followingEmptyOrMyself() ) {
cbFunc(cbArg, null, null);
function getRandomFollowSuggestion() {
if (followingEmptyOrMyself())
return;
var i = Math.floor(Math.random() * followingUsers.length); // Math.floor(Math.random() * (max - min + 1)) + min for getting inclusive random from min to max; our min and max are 0 and followingUsers.length - 1
while (followingUsers[i] === defaultScreenName)
i = Math.floor(Math.random() * followingUsers.length);
if (typeof twisterFollowingO === 'undefined' ||
typeof twisterFollowingO.followingsFollowings[followingUsers[i]] === 'undefined') {
setTimeout(getRandomFollowSuggestion, 500);
return;
}
var i = parseInt( Math.random() * followingUsers.length );
if ( (i < followingUsers.length && followingUsers[i] == defaultScreenName) ||
typeof(twisterFollowingO) === 'undefined' ||
typeof(twisterFollowingO.followingsFollowings[followingUsers[i]]) === 'undefined') {
setTimeout(function() {getRandomFollowSuggestion(cbFunc, cbArg);}, 500);
return;
}
if( i < followingUsers.length ) {
var suggested = false;
var j = parseInt( Math.random() * twisterFollowingO.followingsFollowings[followingUsers[i]]["following"].length );
for( ; j < twisterFollowingO.followingsFollowings[followingUsers[i]]["following"].length; j++ ) {
if( followingUsers.indexOf(twisterFollowingO.followingsFollowings[followingUsers[i]]["following"][j]) < 0 &&
_followSuggestions.indexOf(twisterFollowingO.followingsFollowings[followingUsers[i]]["following"][j]) < 0 ) {
cbFunc(cbArg, twisterFollowingO.followingsFollowings[followingUsers[i]]["following"][j], followingUsers[i]);
_followSuggestions.push(twisterFollowingO.followingsFollowings[followingUsers[i]]["following"][j]);
suggested = true;
break;
}
}
if( !suggested ) {
cbFunc(cbArg, null, null);
}
} else {
cbFunc(cbArg, null, null);
var suggested = false;
var j = Math.floor(Math.random() * twisterFollowingO.followingsFollowings[followingUsers[i]].following.length);
for( ; j < twisterFollowingO.followingsFollowings[followingUsers[i]].following.length; j++ ) {
if( followingUsers.indexOf(twisterFollowingO.followingsFollowings[followingUsers[i]].following[j]) < 0 &&
_followSuggestions.indexOf(twisterFollowingO.followingsFollowings[followingUsers[i]].following[j]) < 0) {
processWhoToFollowSuggestion(twisterFollowingO.followingsFollowings[followingUsers[i]].following[j], followingUsers[i]);
_followSuggestions.push(twisterFollowingO.followingsFollowings[followingUsers[i]].following[j]);
suggested = true;
break;
}
}
if (!suggested)
setTimeout(getRandomFollowSuggestion, 500);
}
function whoFollows(username) {
@ -555,46 +544,38 @@ function showFollowingUsers(){
if( followingUsers[i] == defaultScreenName ) {
resItem.find("button").hide();
}
resItem.prependTo($followingList);
toggleFollowButton(followingUsers[i], true)
}
$.MAL.followingListLoaded();
}
function processSuggestion(arg, suggestion, followedBy) {
if( suggestion ) {
var $module = $('.module.who-to-follow');
var $list = $module.find('.follow-suggestions');
var item = $("#follow-suggestion-template").clone(true);
item.removeAttr("id");
function processWhoToFollowSuggestion(suggestion, followedBy) {
if (suggestion) {
var module = $('.module.who-to-follow');
var list = module.find('.follow-suggestions');
var item = $('#follow-suggestion-template').clone(true)
.removeAttr('id');
item.find(".twister-user-info").attr("data-screen-name", suggestion);
item.find('.twister-user-info').attr('data-screen-name', suggestion);
item.find('.twister-user-name').attr('href', $.MAL.userUrl(suggestion));
item.find('.twister-by-user-name').attr('href', $.MAL.userUrl(followedBy));
item.find('.twister-user-tag').text('@' + suggestion);
item.find(".twister-user-name").attr("href", $.MAL.userUrl(suggestion));
item.find(".twister-by-user-name").attr("href", $.MAL.userUrl(followedBy));
item.find(".twister-user-tag").text("@" + suggestion);
getAvatar(suggestion, item.find('.twister-user-photo'));
getFullname(followedBy, item.find('.followed-by').text(followedBy));
getAvatar(suggestion,item.find(".twister-user-photo"));
//getFullname(suggestion,item.find(".twister-user"));
var $spanFollowedBy = item.find(".followed-by");
$spanFollowedBy.text(followedBy);
getFullname(followedBy,$spanFollowedBy);
item.find('.twister-user-remove').bind("click", function() {
item.find('.twister-user-remove').on('click', function() {
item.remove();
getRandomFollowSuggestion(processSuggestion);
getRandomFollowSuggestion();
});
$list.append(item).show();
$module.find('.refresh-users').show();
$module.find('.loading-roller').hide();
} else {
setTimeout(function(){
getRandomFollowSuggestion(processSuggestion);
}, 100);
}
list.append(item).show();
module.find('.refresh-users').show();
module.find('.loading-roller').hide();
} else
console.warn('nothing to proceed: no twisters to follow was suggested');
}
function closeSearchDialog()
@ -607,9 +588,9 @@ function closeSearchDialog()
function userSearchKeypress(event) {
var partialName = $(".userMenu-search-field").val().toLowerCase();
var searchResults = $(".search-results");
if ( partialName.substr( 0, 1 ) == '#' ) {
if(searchResults.is(":visible"))
searchResults.slideUp( "fast" );
@ -694,37 +675,28 @@ function processDropdownUserResults(partialName, results){
_searchingPartialUsers = "";
}
function newFollowingConfigModal(username) {
var FollowingConfigContent = $("#following-config-modal-template").children().clone(true);
FollowingConfigContent.closest(".following-config-modal-content").attr("data-screen-name", username)
FollowingConfigContent.find(".following-config-method-message").text(polyglot.t("Which way do you want to follow"))
FollowingConfigContent.find(".following-screen-name b").text(username);
return FollowingConfigContent;
}
function userClickFollow(e) {
e.stopPropagation();
e.preventDefault();
var $userInfo = $(e.target).closest("[data-screen-name]");
var username = $userInfo.attr("data-screen-name");
if(!defaultScreenName)
{
alert(polyglot.t("You have to log in to follow users."));
return;
if (!defaultScreenName) {
alert(polyglot.t('You have to log in to follow users.'));
return;
}
var FollowingConfigClass = "following-config-modal";
openPrompt( FollowingConfigClass );
var username = $(e.target).closest('[data-screen-name]').attr('data-screen-name');
var content = $('#following-config-modal-template').children().clone(true);
var FollowingConfigContent = newFollowingConfigModal(username);
FollowingConfigContent.appendTo("." +FollowingConfigClass +" .modal-content");
content.closest('.following-config-modal-content').attr('data-screen-name', username);
content.find('.following-config-method-message').text(polyglot.t('Which way do you want to follow'));
content.find('.following-screen-name b').text(username);
//título do modal
$("." +FollowingConfigClass +" h3").text(polyglot.t("Following config"));
openModal({
classBase: '.prompt-wrapper',
classAdd: 'following-config-modal',
content: content,
title: polyglot.t('Following config')
});
}
function initUserSearch() {
@ -733,14 +705,15 @@ function initUserSearch() {
$userSearchField.bind( "click", userSearchKeypress );
$(".userMenu-search").clickoutside( closeSearchDialog );
$("button.follow").bind( "click", userClickFollow );
$(".following-config-method-buttons .public-following").bind( "click", setFollowingMethod );
$(".following-config-method-buttons .public-following").click( function() {
closePrompt();
// delay reload so dhtput may do it's job
window.setTimeout("loadModalFromHash();",500);
});
// following stuff should be moved to special function
$('button.follow').on('click', userClickFollow);
$('.following-config-method-buttons .public-following')
.on('click', function(e) {
setFollowingMethod(e);
closeModalHandler('.prompt-wrapper');
window.setTimeout(loadModalFromHash, 500); // delay reload so dhtput may do it's job
})
;
}
function followingListPublicCheckbox(e) {
@ -761,22 +734,16 @@ function followingListPublicCheckbox(e) {
follow(username, publicFollow);
}
function setFollowingMethod(e) {
e.stopPropagation();
function setFollowingMethod(event) {
var button = $(event.target);
var username = button.closest('.following-config-modal-content').attr('data-screen-name');
var $this = $(this);
var username = $this.closest(".following-config-modal-content").attr("data-screen-name");
var publicFollow = false;
if( !$this.hasClass("private") ) {
publicFollow = true;
}
//console.log("start following @" +username +" by method "+publicFollow);
follow(username, publicFollow,
(function() {
toggleFollowButton(this, true);
}).bind(username)
follow(username,
(button.hasClass('private')) ? false : true, // is folowing public
toggleFollowButton, username, true // last two are args for toggleFollowButton()
);
event.stopPropagation();
}
@ -850,12 +817,12 @@ function initInterfaceFollowing() {
});
$(window)
.on("eventFollow", function(e, user) {
$(".following-count").text(followingUsers.length-1);
.on('eventFollow', function(e, user) {
$('.mini-profile .following-count').text(followingUsers.length - 1);
showFollowingUsers();
})
.on("eventUnfollow", function(e, user) {
$(".following-count").text(followingUsers.length-1);
.on('eventUnfollow', function(e, user) {
$('.mini-profile .following-count').text(followingUsers.length - 1);
showFollowingUsers();
});
}
@ -892,12 +859,14 @@ var InterfaceFunctions = function()
}, {cbFunc:cbFunc, cbArg:cbArg});
}
}
};
//***********************************************
//******************* INIT **************
//***********************************************
var interfaceFunctions = new InterfaceFunctions;
$( document ).ready( interfaceFunctions.init );
if (!/\/home.html$/i.test(document.location)) { // FIXME we're doing it wrong, interfaceFunctions declaration should be inside interface common
var interfaceFunctions = new InterfaceFunctions;
$(document).ready(interfaceFunctions.init);
}

67
js/twister_formatpost.js
View File

@ -93,14 +93,13 @@ function postToElem( post, kind, promoted ) {
elem.find('.post-text').html(htmlFormatMsg(msg, mentions));
postData.attr('data-text-mentions', mentions);
var replyTo = [];
var replyTo = '';
if( n !== defaultScreenName )
replyTo.push(['@', n, ' '].join(''));
replyTo += '@' + n + ' ';
for (var i = 0; i < mentions.length; i++) {
if (mentions[i] !== n && mentions[i] !== defaultScreenName)
replyTo.push(['@', mentions[i], ' '].join(''));
replyTo += '@' + mentions[i] + ' ';
}
replyTo = replyTo.join('');
var postTextArea = elem.find('.post-area-new textarea');
postTextArea.attr('data-reply-to', replyTo);
@ -166,8 +165,8 @@ function dmDataToSnippetItem(dmData, remoteUser) {
// format dmdata (returned by getdirectmsgs) to display in conversation thread
function dmDataToConversationItem(dmData, localUser, remoteUser) {
var from = (dmData.from && dmData.from.length && dmData.from.charCodeAt(0))
? dmData.from
var from = (dmData.from && dmData.from.length && dmData.from.charCodeAt(0))
? dmData.from
: (dmData.fromMe ? localUser : remoteUser);
var classDm = dmData.fromMe ? "sent" : "received";
var dmItem = $("#dm-chat-template").clone(true);
@ -183,8 +182,8 @@ function dmDataToConversationItem(dmData, localUser, remoteUser) {
// convert message text to html, featuring @users and links formating.
function htmlFormatMsg(msg, mentions) {
function htmlMention(str, pre) {
str = str.replace(new RegExp(['^', pre, '@'].join('')), '').toLowerCase();
function htmlMention(str) {
str = str.slice(1, str.length).toLowerCase();
mentions.push(str); // FIXME feel the pain of the scope chain
@ -193,63 +192,61 @@ function htmlFormatMsg(msg, mentions) {
html.push($('#msg-user-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))/ig, ['<a href="', $.MAL.userUrl(str), '" '].join('')) // $().closest('a.open-profile-modal').attr('href', $.MAL.userUrl(username))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1@', str, '$2'].join('')) // $().closest('a.open-profile-modal').text('@'+username)
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))/ig, '<a href="' + $.MAL.userUrl(str) + '" ') // $().closest('a.open-profile-modal').attr('href', $.MAL.userUrl(username))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-profile-modal\b))[^]*?>)[^]*?(<\/a>)/ig, '$1@' + str + '$2') // $().closest('a.open-profile-modal').text('@'+username)
);
return ['>', html.length - 1, '<'].join('');
return '>' + (html.length - 1).toString() + '<';
}
function htmlHashtag(str, pre) {
str = str.replace(new RegExp(['^', pre, '#'].join('')), '');
function htmlHashtag(str) {
str = str.slice(1, str.length);
html.push($('#hashtag-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))/ig, ['<a href="', $.MAL.hashtagUrl(str.toLowerCase()), '" '].join('')) // $().closest('a.open-profile-modal').attr('href', $.MAL.hashtagUrl(hashtag))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1#', str, '$2'].join('')) // $().closest('a.open-profile-modal').text('#'+hashtag)
.replace(/<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))/ig, '<a href="' + $.MAL.hashtagUrl(str.toLowerCase()) + '" ') // $().closest('a.open-profile-modal').attr('href', $.MAL.hashtagUrl(hashtag))
.replace(/(<a\s+(?=[^>]*?\bclass\s*=\s*"(?=[^"]*?\bopen-hashtag-modal\b))[^]*?>)[^]*?(<\/a>)/ig, '$1#' + str + '$2') // $().closest('a.open-profile-modal').text('#'+hashtag)
);
return ['>', html.length - 1, '<'].join('');
return '>' + (html.length - 1).toString() + '<';
}
function htmlHttp(str) {
html.push($('#external-page-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+/ig, ['<a href="', proxyURL(str), '" '].join('')) // $().closest('a').attr('href', proxyURL(url))
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, ['$1', str, '$2'].join('')) // $().closest('a').text(url)
.replace(/<a\s+/ig, '<a href="' + proxyURL(str) + '" ') // $().closest('a').attr('href', proxyURL(url))
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, '$1' + str + '$2') // $().closest('a').text(url)
);
return ['>', html.length - 1, '<'].join('');
return '>' + (html.length - 1).toString() + '<';
}
function htmlEmail(str, pre) {
str = str.replace(new RegExp(['^', pre].join('')), '');
function htmlEmail(str) {
html.push($('#external-page-link-template')[0].outerHTML
.replace(/\bid\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('id')
//.replace(/\bhref\s*=\s*"[^]*?"+/ig, '') // $().removeAttr('href')
.replace(/<a\s+/ig, ['<a href="mailto:', str.toLowerCase(), '" '].join('')) // $().closest('a').attr('href', 'mailto:'+url)
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, [pre, '$1', str, '$2'].join('')) // $().closest('a').text(url)
.replace(/<a\s+/ig, '<a href="mailto:' + str.toLowerCase() + '" ') // $().closest('a').attr('href', 'mailto:'+url)
.replace(/(<a\s+[^]*?>)[^]*?(<\/a>)/ig, '$1' + str + '$2') // $().closest('a').text(url)
);
return ['>', html.length - 1, '<'].join('');
return '>' + (html.length - 1).toString() + '<';
}
function htmlSplitCounter(str) {
html.push(['<span class="splited-post-counter">', str, '</span>'].join(''));
html.push('<span class="splited-post-counter">' + str + '</span>');
return ['>', html.length - 1, '<'].join('');
return '>' + (html.length - 1).toString() + '<';
}
var html = [];
return _formatText(escapeHtmlEntities(msg)
.replace(/(^|[^\/]\B(?!\S*:\/\/\S*@))@\w+\b/g, htmlMention)
.replace(/(^|[^<\/]\B(?!\S*:\/\/\S*#))#[^#\\\/\.,:;\?\!\*\[\]\(\)\{\}\^\|%'"\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011>\s]+/g, htmlHashtag) // unicode escaped stuff is '“”…—一。，：？！【】' for our chinese friends
.replace(/\bhttps?:\/\/\S[^>\s]+/ig, htmlHttp)
.replace(/([^<\/])\b(?!\S*:\/\/\S*@)\S+@\S+\.\S[^>\s]+/g, htmlEmail)
.replace(/\bhttps?:\/\/[^>\s]+/ig, htmlHttp)
.replace(/[^<\s]+@\S+\.[^>\s]+/g, htmlEmail) // should be pretty slow monstrous RegExp here to handle it in accordance with RFC but twisters just gonna avoid text_without_spaces@text_with_._but_without spaces to not get it like email address
.replace(/@\w+\b/g, htmlMention)
.replace(/#[^#\\\/\.,:;\?\!\*\[\]\(\)\{\}\^\|%'"\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011>\s]+/g, htmlHashtag) // unicode escaped stuff is '“”…—一。，：？！【】' for our chinese friends
.replace(/\(\d{1,2}\/\d{1,2}\)$/, htmlSplitCounter)
.replace(/>(\d+)</g, function(candy, core) {return html[core]})
);
@ -258,12 +255,12 @@ function htmlFormatMsg(msg, mentions) {
function proxyURL(url) {
var proxyOpt = $.Options.useProxy.val;
if (proxyOpt !== 'disable' && !$.Options.useProxyForImgOnly.val) {
// proxy alternatives may be added to options page
// proxy alternatives may be added to options page FIXME currently not; and we need more fresh proxies
if (proxyOpt === 'ssl-proxy-my-addr') {
url = ['https://ssl-proxy.my-addr.org/myaddrproxy.php/',
url.substring(0, url.indexOf(':')), url.substr(url.indexOf('/') + 1)].join('');
url = 'https://ssl-proxy.my-addr.org/myaddrproxy.php/' +
url.substring(0, url.indexOf(':')) + url.substr(url.indexOf('/') + 1);
} else if (proxyOpt === 'anonymouse')
url = ['http://anonymouse.org/cgi-bin/anon-www.cgi/', url].join('');
url = 'http://anonymouse.org/cgi-bin/anon-www.cgi/' + url;
}
return url;

225
js/twister_newmsgs.js
View File

@ -17,20 +17,20 @@ var groupChatAliases = []
// process a mention received to check if it is really new
function processMention(user, mentionTime, data) {
var key = user + ";" + mentionTime;
var key = user + ';' + mentionTime;
var curTime = new Date().getTime() / 1000;
if( mentionTime > curTime + 3600 * 2 ) {
console.log("mention from the future will be ignored");
} else {
if( !(key in _knownMentions) ) {
if (mentionTime > curTime + 7200) // 3600 * 2
console.warn('ignoring mention from the future');
else {
if (!_knownMentions[key]) {
// mention must be somewhat recent compared to last known one to be considered new
if( mentionTime + 3600 * 24 * 3 > _lastMentionTime ) {
if (mentionTime + 259200 > _lastMentionTime) { // 3600 * 24 * 3
_newMentions++;
_newMentionsUpdated = true;
_lastMentionTime = Math.max(mentionTime,_lastMentionTime);
data["isNew"] = true;
_lastMentionTime = Math.max(mentionTime, _lastMentionTime);
data.isNew = true;
}
_knownMentions[key] = {mentionTime:mentionTime, data:data};
_knownMentions[key] = {mentionTime: mentionTime, data: data};
purgeOldMentions();
saveMentionsToStorage();
}
@ -38,10 +38,10 @@ function processMention(user, mentionTime, data) {
}
function purgeOldMentions() {
for( var key in _knownMentions ) {
if( _knownMentions.hasOwnProperty(key) ) {
if( !_knownMentions[key].mentionTime || !_knownMentions[key].data ||
_knownMentions[key].mentionTime + PURGE_OLD_MENTIONS_TIMEOUT < _lastMentionTime ) {
for (var key in _knownMentions) {
if (_knownMentions[key]) {
if (!_knownMentions[key].mentionTime || !_knownMentions[key].data ||
_knownMentions[key].mentionTime + PURGE_OLD_MENTIONS_TIMEOUT < _lastMentionTime) {
delete _knownMentions[key];
}
}
@ -49,87 +49,85 @@ function purgeOldMentions() {
}
function saveMentionsToStorage() {
var ns=$.initNamespaceStorage(defaultScreenName);
ns.localStorage.set("knownMentions", _knownMentions);
ns.localStorage.set("lastMentionTime", _lastMentionTime);
ns.localStorage.set("newMentions", _newMentions);
ns.localStorage.set("lastLocalMentionId",_lastLocalMentionId);
var ns = $.initNamespaceStorage(defaultScreenName);
ns.localStorage.set('knownMentions', _knownMentions);
ns.localStorage.set('lastMentionTime', _lastMentionTime);
ns.localStorage.set('newMentions', _newMentions);
ns.localStorage.set('lastLocalMentionId', _lastLocalMentionId);
}
function loadMentionsFromStorage() {
var ns=$.initNamespaceStorage(defaultScreenName);
if( ns.localStorage.isSet("knownMentions") )
_knownMentions = ns.localStorage.get("knownMentions");
if( ns.localStorage.isSet("lastMentionTime") )
_lastMentionTime = ns.localStorage.get("lastMentionTime");
if( ns.localStorage.isSet("newMentions") )
_newMentions = ns.localStorage.get("newMentions");
if( ns.localStorage.isSet("lastLocalMentionId") )
_lastLocalMentionId = ns.localStorage.get("lastLocalMentionId");
var ns = $.initNamespaceStorage(defaultScreenName);
if (ns.localStorage.isSet('knownMentions'))
_knownMentions = ns.localStorage.get('knownMentions');
if (ns.localStorage.isSet('lastMentionTime'))
_lastMentionTime = ns.localStorage.get('lastMentionTime');
if (ns.localStorage.isSet('newMentions'))
_newMentions = ns.localStorage.get('newMentions');
if (ns.localStorage.isSet('lastLocalMentionId'))
_lastLocalMentionId = ns.localStorage.get('lastLocalMentionId');
}
function requestMentionsCount() {
// first: getmentions from torrents we follow
twisterRpc("getmentions", [defaultScreenName, 100, {"since_id":_lastLocalMentionId}],
function(args, data) {
if( data ) {
for( var i = 0; i < data.length; i++ ) {
_lastLocalMentionId = Math.max(_lastLocalMentionId, data[i]["id"]);
var userpost = data[i]["userpost"];
processMention( userpost["n"], userpost["time"], data[i]);
}
$.MAL.updateNewMentionsUI(_newMentions);
}
}, null,
function(req, ret) {console.log("getmentions API requires twister-core > 0.9.27");}, null);
twisterRpc('getmentions', [defaultScreenName, 100, {since_id: _lastLocalMentionId}],
function(args, data) {
if (data) {
for (var i = 0; i < data.length; i++) {
_lastLocalMentionId = Math.max(_lastLocalMentionId, data[i].id);
var userpost = data[i].userpost;
processMention(userpost.n, userpost.time, data[i]);
}
$.MAL.updateNewMentionsUI(_newMentions);
}
}, null,
function(req, ret) {console.warn('getmentions API requires twister-core > 0.9.27');}, null
);
// second: get mentions from dht (not-following)
dhtget( defaultScreenName, "mention", "m",
function(args, data) {
if( data ) {
for( var i = 0; i < data.length; i++ ) {
var userpost = data[i]["userpost"];
processMention( userpost["n"], userpost["time"], data[i]);
}
$.MAL.updateNewMentionsUI(_newMentions);
}
}, {},
[10000,2000,3]); // use extended timeout parameters (requires twister_core >= 0.9.14)
dhtget(defaultScreenName, 'mention', 'm',
function(args, data) {
if (data) {
for (var i = 0; i < data.length; i++) {
var userpost = data[i].userpost;
processMention(userpost.n, userpost.time, data[i]);
}
$.MAL.updateNewMentionsUI(_newMentions);
}
}, {},
[10000, 2000, 3] // use extended timeout parameters (requires twister_core >= 0.9.14)
);
if( _newMentionsUpdated ) {
if (_newMentionsUpdated) {
_newMentionsUpdated = false;
if ( _newMentions ) {
if (_newMentions) {
$.MAL.soundNotifyMentions();
if ($.Options.showDesktopNotifMentions.val === 'enable') {
if ($.Options.showDesktopNotifMentions.val === 'enable')
$.MAL.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t('new_mentions', _newMentions)+'.', false,'twister_notification_new_mentions', $.Options.showDesktopNotifMentionsTimer.val, function(){$.MAL.showMentions(defaultScreenName)}, false)
}
}
}
// was moved here from requestDMsCount() because that is not ticking right
// we would place it with other notifications into separate notification center
if( _newDMsUpdated ) {
if (_newDMsUpdated) {
_newDMsUpdated = false;
var newDMs = getNewDMsCount();
if ( newDMs ) {
if (newDMs) {
$.MAL.soundNotifyDM();
if ($.Options.showDesktopNotifDMs.val === 'enable') {
if ($.Options.showDesktopNotifDMs.val === 'enable')
$.MAL.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t('new_direct_messages', newDMs)+'.', false, 'twister_notification_new_DMs', $.Options.showDesktopNotifDMsTimer.val, function(){$.MAL.showDMchat()}, false)
}
}
}
}
function resetMentionsCount() {
_newMentions = 0;
for( var key in _knownMentions ) {
if( _knownMentions.hasOwnProperty(key) && _knownMentions[key].data ) {
delete _knownMentions[key].data["isNew"]
}
for (var key in _knownMentions) {
if (_knownMentions[key] && _knownMentions[key].data)
delete _knownMentions[key].data.isNew
}
saveMentionsToStorage();
$.MAL.updateNewMentionsUI(_newMentions);
@ -140,13 +138,13 @@ function initMentionsCount() {
loadMentionsFromStorage();
$.MAL.updateNewMentionsUI(_newMentions);
requestMentionsCount();
setInterval("requestMentionsCount()", 10000);
setInterval(requestMentionsCount, 10000);
}
function getMentionsData() {
mentions = []
for( var key in _knownMentions ) {
if( _knownMentions.hasOwnProperty(key) && _knownMentions[key].data ) {
for (var key in _knownMentions) {
if (_knownMentions[key] && _knownMentions[key].data) {
mentions.push(_knownMentions[key].data);
}
}
@ -159,61 +157,60 @@ var _lastDMIdPerUser = {};
var _newDMsPerUser = {};
function saveDMsToStorage() {
var ns=$.initNamespaceStorage(defaultScreenName);
ns.localStorage.set("lastDMIdPerUser", _lastDMIdPerUser);
ns.localStorage.set("newDMsPerUser", _newDMsPerUser);
var ns = $.initNamespaceStorage(defaultScreenName);
ns.localStorage.set('lastDMIdPerUser', _lastDMIdPerUser);
ns.localStorage.set('newDMsPerUser', _newDMsPerUser);
}
function loadDMsFromStorage() {
var ns=$.initNamespaceStorage(defaultScreenName);
if( ns.localStorage.isSet("lastDMIdPerUser") )
_lastDMIdPerUser = ns.localStorage.get("lastDMIdPerUser");
if( ns.localStorage.isSet("newDMsPerUser") )
_newDMsPerUser = ns.localStorage.get("newDMsPerUser");
var ns = $.initNamespaceStorage(defaultScreenName);
if (ns.localStorage.isSet('lastDMIdPerUser'))
_lastDMIdPerUser = ns.localStorage.get('lastDMIdPerUser');
if (ns.localStorage.isSet('newDMsPerUser'))
_newDMsPerUser = ns.localStorage.get('newDMsPerUser');
}
function requestDMsCount() {
var followList = [];
for( var i = 0; i < followingUsers.length; i++ ) {
followList.push({username:followingUsers[i]});
}
for( var i = 0; i < groupChatAliases.length; i++ ) {
followList.push({username:groupChatAliases[i]});
}
for (var i = 0; i < followingUsers.length; i++)
followList.push({username: followingUsers[i]});
for (var i = 0; i < groupChatAliases.length; i++ )
followList.push({username: groupChatAliases[i]});
twisterRpc("getdirectmsgs", [defaultScreenName, 1, followList],
function(req, dmUsers) {
for( var u in dmUsers ) {
if( dmUsers.hasOwnProperty(u) ) {
var dmData = dmUsers[u][0];
if( (u in _lastDMIdPerUser) && (u in _newDMsPerUser) ) {
if( dmData.id != _lastDMIdPerUser[u] ) {
_newDMsPerUser[u] += (dmData.id - _lastDMIdPerUser[u]);
_newDMsUpdated = true;
}
} else {
_newDMsPerUser[u] = dmData.id+1;
_newDMsUpdated = true;
}
_lastDMIdPerUser[u] = dmData.id;
}
}
if( _newDMsUpdated ) {
saveDMsToStorage();
$.MAL.updateNewDMsUI(getNewDMsCount());
}
}, null,
function(req, ret) {console.log("ajax error:" + ret);}, null);
twisterRpc('getdirectmsgs', [defaultScreenName, 1, followList],
function(req, dmUsers) {
for (var u in dmUsers) {
if (dmUsers[u]) {
var dmData = dmUsers[u][0];
if (u in _lastDMIdPerUser && u in _newDMsPerUser) {
if (dmData.id !== _lastDMIdPerUser[u]) {
_newDMsPerUser[u] += dmData.id - _lastDMIdPerUser[u];
_newDMsUpdated = true;
}
} else {
_newDMsPerUser[u] = dmData.id + 1;
_newDMsUpdated = true;
}
_lastDMIdPerUser[u] = dmData.id;
}
}
if (_newDMsUpdated) {
saveDMsToStorage();
$.MAL.updateNewDMsUI(getNewDMsCount());
}
}, null,
function(req, ret) {console.warn('ajax error:' + ret);}, null
);
}
function getNewDMsCount() {
var newDMs = 0;
for( var key in _newDMsPerUser ) {
if( _newDMsPerUser.hasOwnProperty(key) ) {
newDMs += _newDMsPerUser[key];
}
for (var user in _newDMsPerUser) {
if (_newDMsPerUser[user])
newDMs += _newDMsPerUser[user];
}
return newDMs;
}
@ -226,22 +223,22 @@ function resetNewDMsCountForUser(user, lastId) {
}
function updateGroupList() {
twisterRpc("listgroups", [],
function(req, ret) {groupChatAliases=ret;}, null,
function(req, ret) {console.log("twisterd >= 0.9.30 required for listgroups");}, null);
twisterRpc('listgroups', [],
function(req, ret) {groupChatAliases = ret;}, null,
function(req, ret) {console.warn('twisterd >= 0.9.30 required for listgroups');}, null
);
}
function initDMsCount() {
loadDMsFromStorage();
$.MAL.updateNewDMsUI(getNewDMsCount());
//quick hack to obtain list of group chat aliases
updateGroupList();
setInterval("updateGroupList();", 60000);
setInterval(updateGroupList, 60000);
setTimeout("requestDMsCount();", 200);
setTimeout(requestDMsCount, 200);
//polling not needed: processNewPostsConfirmation will call requestDMsCount.
//setInterval("requestDMsCount()", 5000);
//setInterval('requestDMsCount()', 5000);
}
function newmsgsChangedUser() {

37
login.html
View File

@ -31,10 +31,8 @@
<link rel="icon" type="image/png" href="img/twister_mini.png" />
</head>
<body>
<!-- MENU SUPERIOR INIT -->
<!-- MENU SUPERIOR INIT -->
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
@ -42,20 +40,14 @@
<li class="userMenu-profile current"><a class="label" href="login.html">Login</a></li>
<li class="userMenu-config">
</li>
</ul>
</nav>
<!-- MENU SUPERIOR END -->
<div class="wrapper">
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<div class="login">
<h2 class="header-bold"> twister login </h2>
<div class="module">
<p> <span>Existing local users</span> </p>
<div>
@ -64,9 +56,7 @@
<button class="login-local-username">Login</button>
</div>
</div>
<!-- <span> Or... </span> -->
<!-- <span> Or... </span> -->
<div class="module">
<p> <span>Create a new user</span> </p>
<div>
@ -78,9 +68,7 @@
<button class="create-user disabled" disable="true">Create this nickname</button>
</div>
</div>
<!-- <span> Or... </span> -->
<div class="module">
<div>
<p> <span>Import secret key</span> </p>
@ -94,29 +82,19 @@
<button class="import-secret-key disabled" disable="true">Import key</button>
</div>
</div>
</div>
<!-- LADO ESQUERDO DE MÓDULOS END -->
</div>
<!-- TEMPLATES INIT -->
<div id="templates" style="display:none;">
<!-- TEMPLATE DO MODAL GENÉRICO INIT -->
<div class="modal-blackout">
<div class="modal-wrapper">
<div class="modal-wrapper">
<div class="modal-header">
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<h3></h3>
</div>
<div class="modal-content"></div>
<div class="modal-buttons">
<button class="modal-cancel cancel">Cancel</button>
<button class="modal-propagate">Retransmit</button>
</div>
</div>
<div class="modal-blackout"></div>
</div>
<!-- TEMPLATE DO MODAL GENÉRICO END -->
@ -150,10 +128,7 @@
</div>
</div>
</div>
</div>
<!-- TEMPLATES END -->
</body>
</html>

37
theme_calm/css/profile.css
View File

@ -137,7 +137,7 @@
}
.forEdition .profile-card-main input:hover
{
background: rgba( 255, 255, 255, .7 );
background: rgba( 255, 255, 255, .7 );
}
.forEdition .profile-card-photo:hover{
background: #9096a5;
@ -223,25 +223,21 @@
************ PROFILE MODAL ***********
**************************************/
.profile-modal .modal-wrapper
{
.modal-wrapper.profile-modal {
width: 580px;
border-radius: 5px;
overflow: hidden;
position: absolute;
top:5%;
height: 90%;
margin-left: -290px;
height: 760px;
margin: -380px 0 0 -290px;
}
.profile-modal .modal-content {
height: 730px;
overflow-y: hidden;
padding: 3px;
}
.profile-modal .modal-header, .profile-modal .profile-card {
z-index: 1;
}
.profile-modal .modal-content
{
padding: 3px;
height: 100%;
}
.profile-modal h1.profile-name {
color: #43464d;
}
@ -325,18 +321,17 @@
.profile-modal .profile-bitmessage {
background: #e3e5ea url(../img/bm.png) center no-repeat;
}
.profile-modal .profile-data
{
.profile-modal .profile-data {
display: inline-block;
margin-left: -4px;
border-bottom: 0;
}
.profile-modal .postboard
{
.profile-modal .postboard {
margin-left: 0;
padding: 5px 0 5px 0;
height: 73%;
}
.profile-modal .postboard h2 {
width: auto;
}

565
theme_calm/css/style.css
View File

@ -34,8 +34,8 @@ b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video, textarea
{
@ -458,7 +458,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
{
border: solid 1px rgba( 69, 71, 77, .1 );
background: #f3f5fb;
}
.dashboard .module {
margin: 0 0 3%;
@ -535,7 +535,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
}
.userMenu-search-profiles li:hover span
{
color: #fff;
color: #fff;
}
.userMenu-search-profiles button
{
@ -555,11 +555,11 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
}
.userMenu-search-sugestions
{
border-bottom: solid 1px rgba( 69, 71, 77, .1 );
border-bottom: solid 1px rgba( 69, 71, 77, .1 );
}
.userMenu-search-sugestions a
{
color: rgba( 0, 0, 0, .7 );
color: rgba( 0, 0, 0, .7 );
padding: 5px 20px;
font-size: 12px;
display: block;
@ -585,7 +585,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
{
font-size: 12px;
font-weight: bold;
color: rgba( 0, 0, 0, .7 );
color: rgba( 0, 0, 0, .7 );
padding: 0 75px 0 15px;
}
/***********************************
@ -699,12 +699,12 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
}
.mini-profile-actions ul li + li
{
margin: 0 2px;
margin: 0 2px;
}
.mini-profile-actions:hover ul li:hover
{
background: rgba( 0, 0, 0, .7 );
color: #fff;
color: #fff;
}
.mini-profile-info a:hover
{
@ -796,7 +796,7 @@ textarea.splited-post {
font: 17px/34px "Open Sans Condensed";
border-radius: 2px;
opacity: 1;
-webkit-transition: all 200ms;
-moz-transition: all 200ms;
-ms-transition: all 200ms;
@ -812,7 +812,7 @@ textarea.splited-post {
font: 17px/34px "Open Sans Condensed", Symbola;
border-radius: 2px;
opacity: 1;
-webkit-transition: all 200ms;
-moz-transition: all 200ms;
-ms-transition: all 200ms;
@ -823,7 +823,7 @@ textarea.splited-post {
.post-submit:hover, .dm-submit:hover, .undo-unicode:hover {
color: #fff;
opacity: .9;
}
.directMessages .dm-submit {
margin-right: 55px;
@ -1077,11 +1077,7 @@ textarea.splited-post {
background: #7691ce;
border-radius: 2px;
}
.postboard h2.fixed
{
z-index: 2;
border-top: solid 4px #fbf9f6;
}
.postboard a.promoted-posts-only {
display: inline-block;
padding: 0 15px;
@ -1110,7 +1106,7 @@ textarea.splited-post {
.postboard-posts li:first-child {
border-radius: 4px 4px 0 0;
}
.postboard-news {
.postboard-news {
float: right;
background: rgba( 0, 0, 0, .2 );
border: none;
@ -1153,7 +1149,7 @@ textarea.splited-post {
}
.postboard-posts > .post:after
{
content: "";
content: "";
position: absolute;
right: 0;
top: 0;
@ -1745,67 +1741,52 @@ textarea.splited-post {
}
/*************************************
****************** POPUP PROMPT ******
************* POPUP MODAL ************
**************************************/
.prompt-wrapper
{
position: fixed;
top: 50%;
left: 50%;
background: rgba( 255, 255,255, 1.0 );
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 );
z-index: 5;
width: 600px;
margin-left:-300px;
}
.prompt-wrapper .modal-header h3{
background: #7691CE;
}
/*************************************
**************************** POPUP MODAL
**************************************/
.modal-blackout
{
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
background: rgba( 0, 0, 0, .6 );
display: none;
.modal-wrapper {
background: #fff;
z-index: 3;
}
.modal-blackout.reply .post
{
background: #ececed;
padding: 10px 15px;
}
.modal-wrapper
{
position: absolute;
position: fixed;
top: 50%;
left: 50%;
background: rgba( 255, 255, 255, 1.0 );
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 );
width: 580px;
height: 720px;
overflow: hidden;
margin: -360px 0 0 -290px;
border-radius: 0 0 4px 4px;
box-shadow: 0 0 30px rgba(0,0,0, .6);
}
.modal-header
{
position: relative;
.modal-header {
background: #7691ce;
position: relative;
height: 30px;
}
.modal-header h3
{
padding: 5px;
font-weight: bold;
background: #7691CE;
.modal-header h3 {
color: #fff;
padding: 5px 10px;
font-weight: bold;
}
.modal-close
{
.modal-wrapper .modal-content {
background: #fff;
height: 690px;
overflow-y: auto;
}
.modal-wrapper .modal-blackout {
background: rgba(0,0,0, .6);
z-index: -1;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.modal-close {
position: absolute;
right: 0;
top: 0;
@ -1814,13 +1795,14 @@ textarea.splited-post {
color: rgba( 255, 255, 255, .7 );
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
transition: all .1s linear;
}
.modal-close:hover
{
.modal-close:hover {
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-back,
.mark-all-as-read {
position: absolute;
@ -1832,128 +1814,30 @@ textarea.splited-post {
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
display: none;
display: none;
}
.modal-back:hover,
.mark-all-as-read:hover {
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-buttons
{
padding: 10px;
text-align: right;
}
.modal-buttons button:last-child
{
padding: 5px 20px;
.modal-wrapper.reply .post {
background: #ececed;
padding: 10px 15px;
}
/*************************************
****** FOLLOWING-CONFIG PROMPT *******
******** DIRECT MESSAGES MODAL *******
**************************************/
.following-config-modal
{
margin-top: -80px;
}
.following-config-modal .modal-content
{
padding: 10px;
text-align: center;
}
.following-config-modal .modal-buttons
{
display: none;
}
.following-config-method-buttons
{
padding: 10px;
}
/*************************************
******** RETWIST POSTS PROMPT ********
**************************************/
.reTwist
{
margin-top: -100px;
}
.reTwist .post-expand,
.reTwist .post-interactions
{
display: none;
}
.reTwist .post {
margin: 5px;
padding: 5px;
min-height: 68px;
}
/*************************************
****************** REPLY POSTS PROMPT
**************************************/
.reply
{
margin-top: -140px;
}
.reply .modal-buttons
{
display: none;
}
.reply .post-expand,
.reply .post-interactions
{
display: none;
}
.reply .textcomplete-wrapper{
padding-top: 10px;
}
.reply .textcomplete-wrapper textarea{
margin: 10px;
width: 580px;
}
.reply .post-area-extras
{
margin-right: 10px;
}
.reply .post {
margin: 10px;
padding: 5px;
min-height: 68px;
}
/*************************************
****************** DIRECT MESSAGES MODAL
**************************************/
.directMessages .modal-wrapper
{
width: 540px;
height: 470px;
margin: -200px 0 0 -280px;
overflow-x: hidden;
}
.directMessages .modal-content
{
overflow-y: auto;
}
.directMessages .modal-buttons
{
display: none;
}
.direct-messages-list .post
{
.direct-messages-list .post {
padding: 10px 30px 10px 15px;
cursor: pointer;
}
.direct-messages-list .post:after
{
.direct-messages-list .post:after {
content: "►";
position: absolute;
right: 10px;
@ -1961,48 +1845,48 @@ textarea.splited-post {
margin: -6px 0 0 0;
color: rgba( 0, 0, 0, .4 );
}
.direct-messages-thread
{
.direct-messages-thread {
padding: 10px;
}
.direct-messages-thread .post
{
.direct-messages-thread .post {
min-height: 82px;
margin-left: 65px;
}
.direct-messages-thread .post:after,
.direct-messages-thread .post:nth-child(2n):after
{
.direct-messages-thread .post:nth-child(2n):after {
content: "";
width: 1px;
background: transparent;
position: absolute;
top: 25px;
}
.direct-messages-thread .post:after
{
.direct-messages-thread .post:after {
border-top: solid 10px transparent;
border-bottom: solid 10px transparent;
border-right: solid 10px #ececed;
left: -10px;
}
.direct-messages-thread .post-text
{
.direct-messages-thread .post-text {
margin: 2px 10px 4px 4px;
word-wrap: break-word;
}
.direct-messages-thread .post-photo
{
.direct-messages-thread .post-photo {
position: absolute;
left: -65px;
}
.direct-messages-thread .post.sent
{
.direct-messages-thread .post.sent {
margin-right: 60px;
margin-left: 0;
}
.direct-messages-thread .post.sent:after
{
.direct-messages-thread .post.sent:after {
border-top: solid 10px transparent;
border-bottom: solid 10px transparent;
border-right: none;
@ -2010,206 +1894,253 @@ textarea.splited-post {
right: -10px;
left: auto;
}
.direct-messages-thread .post.sent .post-text
{
.direct-messages-thread .post.sent .post-text {
margin: 2px 10px 4px 4px;
}
.direct-messages-thread .post.sent .post-photo
{
.direct-messages-thread .post.sent .post-photo {
position: absolute;
right: -65px;
left: auto;
}
.direct-messages-thread li.message {
cursor: auto;
}
.direct-messages-thread li.message:hover {
background: none;
}
.mark-all-as-read {
right: 60px;
}
.mark-all-as-read:before {
content: '\2714';
}
/*************************************
****************** NEW USER MODAL
*********** NEW USER MODAL ***********
**************************************/
.new-user .modal-wrapper
{
top: 50%;
.new-user.modal-wrapper {
width: 720px;
height: 400px;
margin: -200px 0 0 -360px;
overflow-x: hidden;
overflow-y: hidden;
height: 580px;
margin: -290px 0 0 -360px;
}
.new-user .modal-content
{
margin: 10px 10px 10px 10px;
.new-user .modal-content {
height: 550px;
padding: 25px;
}
.new-user .modal-buttons,
.new-user .modal-close
{
.new-user .modal-close {
display: none;
}
.new-user .text
{
.new-user .text {
margin: 0 0 15px 0;
}
.new-user .emphasis
{
.new-user .emphasis {
font-size: 18px;
text-align: center;
}
.new-user .secret-key
{
color: rgba( .5, 0, 0, 1.0 );
.new-user .secret-key {
color: rgba(.5,0,0, 1.0);
font-weight: bold;
}
/*************************************
****************** HASHTAG MODAL
************ HASHTAG MODAL ***********
**************************************/
.hashtag-modal .modal-wrapper
{
width: 560px;
height: 470px;
margin: -200px 0 0 -280px;
overflow: hidden;
}
.hashtag-modal .modal-content
{
overflow-y: auto;
height: 440px;
}
.hashtag-modal .modal-buttons
{
display: none;
}
.hashtag-modal .postboard
{
.hashtag-modal .postboard {
margin-left: 0;
}
.hashtag-modal .postboard h2 {
width: 100%;
padding-left: 10px;
}
/*************************************
****************** CONVERSATION MODAL
********* CONVERSATION MODAL *********
**************************************/
.conversation-modal .modal-wrapper
{
position: absolute;
width: 560px;
height: 80%;
top: 10%;
margin: 0 0 0 -330px;
overflow: hidden;
}
.conversation-modal .modal-content
{
overflow-y: auto;
height: 90%;
}
.conversation-modal .modal-buttons
{
display: none;
}
.conversation-modal .postboard
{
.conversation-modal .postboard {
margin-left: 0;
}
/*************************************
****************** FOLLOWING MODAL
********** FOLLOWING MODAL ***********
**************************************/
.following-modal .modal-wrapper
{
width: 560px;
height: 470px;
margin: -200px 0 0 -280px;
overflow-x: hidden;
}
.following-modal .modal-content
{
.following-modal .modal-content {
padding: 15px;
height: 400px;
overflow-y: auto;
}
.following-modal .modal-buttons
{
display: none;
}
.following-modal ol
{
.following-modal ol {
margin: 5px;
}
.following-modal .open-profile-modal:hover
{
.following-modal .open-profile-modal:hover {
text-decoration: none;
}
.following-modal .open-profile-modal img
{
.following-modal .open-profile-modal img {
float: none;
}
.following-modal .open-profile-modal span
{
.following-modal .open-profile-modal span {
vertical-align: middle;
}
.following-modal .open-profile-modal span:hover
{
.following-modal .open-profile-modal span:hover {
text-decoration: underline;
}
/*************************************
******************* WHO TO FOLLOW MODAL
********* WHO TO FOLLOW MODAL ********
**************************************/
.who-to-follow-modal .modal-wrapper
{
width: 560px;
height: 470px;
margin: -200px 0 0 -280px;
overflow-x: hidden;
}
.who-to-follow-modal .modal-content
{
.who-to-follow-modal .modal-content {
padding: 15px;
height: 400px;
overflow-y: auto;
}
.who-to-follow-modal .modal-buttons
{
display: none;
}
.who-to-follow-modal ol
{
.who-to-follow-modal ol {
margin: 5px;
}
.who-to-follow-modal .open-profile-modal:hover
{
.who-to-follow-modal .open-profile-modal:hover {
text-decoration: none;
}
.who-to-follow-modal .open-profile-modal span
{
.who-to-follow-modal .open-profile-modal span {
vertical-align: middle;
}
.who-to-follow-modal .open-profile-modal span:hover
{
.who-to-follow-modal .open-profile-modal span:hover {
text-decoration: underline;
}
.who-to-follow-modal .follow
{
.who-to-follow-modal .follow {
float: right;
margin: -30px 10px 0 10px;
}
.who-to-follow-modal .twister-user-info span
{
.who-to-follow-modal .twister-user-info span {
vertical-align: bottom;
}
.who-to-follow-modal .bio
{
.who-to-follow-modal .bio {
font-size: 12px;
color: rgba( 0, 0, 0, .6 );
}
/*************************************
************ POPUP PROMPT ************
**************************************/
.prompt-wrapper {
background: rgba(255,255,255, 1.0);
z-index: 5;
position: fixed;
top: 50%;
left: 50%;
width: 600px;
margin-left: -300px;
box-shadow: 0 0 30px rgba(0,0,0, .6);
}
.prompt-wrapper .modal-buttons {
padding: 10px;
text-align: right;
}
.prompt-wrapper .modal-buttons button:last-child {
padding: 5px 20px;
}
/*************************************
****** FOLLOWING-CONFIG PROMPT *******
**************************************/
.following-config-modal.prompt-wrapper {
margin-top: -80px;
}
.following-config-modal .modal-content {
padding: 10px;
text-align: center;
}
.following-config-modal .modal-buttons {
display: none;
}
.following-config-method-buttons {
padding: 10px;
}
/*************************************
******** RETWIST POSTS PROMPT ********
**************************************/
.reTwist.prompt-wrapper {
margin-top: -100px;
}
.reTwist .post-expand,
.reTwist .post-interactions {
display: none;
}
.reTwist .post {
margin: 5px;
padding: 5px;
min-height: 68px;
}
/*************************************
********* REPLY POSTS PROMPT *********
**************************************/
.reply.prompt-wrapper {
margin-top: -140px;
}
.reply .modal-buttons {
display: none;
}
.reply .post-expand,
.reply .post-interactions {
display: none;
}
.reply .textcomplete-wrapper {
padding-top: 10px;
}
.reply .textcomplete-wrapper textarea {
margin: 10px;
width: 580px;
}
.reply .post-area-extras {
margin-right: 10px;
}
.reply .post {
margin: 10px;
padding: 5px;
min-height: 68px;
}
/*************************************
**************** LOADER **************
**************************************/

273
theme_nin/css/style.css
View File

@ -390,22 +390,22 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
}
/*************************************
******************* PROFILE MODAL
************************************** */
************ PROFILE MODAL ***********
**************************************/
/* line 17, ../sass/_profile.sass */
.profile-modal .modal-wrapper {
.modal-wrapper.profile-modal {
top: 50%;
width: 980px;
max-width: 98%;
position: absolute;
top: 50%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
height: 550px;
margin: -275px 0 0 -490px;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
/* line 25, ../sass/_profile.sass */
.profile-modal .modal-wrapper h3 {
.modal-wrapper.profile-modal h3 {
display: none;
}
/* line 28, ../sass/_profile.sass */
@ -644,12 +644,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
color: #B4C669;
}
/* line 217, ../sass/_profile.sass */
.profile-modal .modal-buttons {
display: none;
/* EDITION PROFILE */
}
/* line 222, ../sass/_profile.sass */
.forEdition.profile-card {
-moz-box-sizing: border-box;
@ -1411,7 +1405,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
}
/* line 227, ../sass/_following.sass */
.following-modal .modal-wrapper {
.modal-wrapper.following-modal {
width: 200px;
}
/* line 229, ../sass/_following.sass */
@ -2580,49 +2574,41 @@ ol.toptrends-list a:hover {
cursor: pointer;
}
/*********** POPUP PROMPT ************ */
/* line 558, ../sass/style.sass */
.prompt-wrapper {
position: fixed;
top: 50%;
left: 50%;
background: white;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.6);
z-index: 5;
width: 600px;
margin-left: -300px;
}
/*********** POPUP MODAL ************* */
/* line 570, ../sass/style.sass */
.modal-blackout {
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
background: rgba(170, 170, 170, 0.8);
display: none;
z-index: 3;
}
/************ POPUP MODAL ************/
/* line 580, ../sass/style.sass */
.modal-wrapper {
position: absolute;
top: 50%;
left: 50%;
overflow: hidden;
background: white;
clear: both;
z-index: 3;
position: fixed;
top: 50%;
left: 50%;
overflow: hidden;
}
/* line 570, ../sass/style.sass */
.modal-blackout {
background: rgba(170,170,170, 0.8);
z-index: -1;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
/* line 588, ../sass/style.sass */
.modal-content {
background: #f3f2f1;
padding: 20px;
}
/* line 585, ../sass/style.sass */
.modal-wrapper .post-area-new {
padding: 10px;
}
/* line 588, ../sass/style.sass */
.modal-content {
background: #f3f2f1;
padding: 20px;
}
/* line 592, ../sass/style.sass */
.modal-content .postboard h2 {
position: fixed;
@ -2725,80 +2711,79 @@ ol.toptrends-list a:hover {
display: none;
}
/* line 677, ../sass/style.sass */
.modal-buttons {
padding: 10px;
text-align: right;
/*********** POPUP PROMPT ************/
/* line 558, ../sass/style.sass */
.prompt-wrapper {
position: fixed;
top: 50%;
left: 50%;
background: white;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.6);
z-index: 5;
width: 600px;
margin-left: -300px;
}
/************ FOLLOWING-CONFIG MODAL ********* */
/* line 685, ../sass/style.sass */
.following-config-modal h2 {
text-transform: none;
.prompt-wrapper .modal-buttons {
padding: 10px;
text-align: right;
}
/* line 687, ../sass/style.sass */
.following-config-modal .modal-wrapper {
top: 43%;
left: 25%;
width: 50%;
.prompt-wrapper .modal-buttons button:last-child {
padding: 5px 20px;
}
/* line 691, ../sass/style.sass */
/****** FOLLOWING-CONFIG PROMPT ******/
.following-config-modal.prompt-wrapper {
margin-top: -100px;
}
.following-config-modal .modal-content {
padding: 10px;
text-align: center;
background-color: white;
}
/* line 695, ../sass/style.sass */
.following-config-modal .modal-buttons {
display: none;
}
/* line 697, ../sass/style.sass */
.following-config-modal h2 {
text-transform: none;
}
.following-config-method-buttons {
padding: 10px;
}
/****** FOLLOWING-CONFIG PROMPT ***** */
/* line 699, ../sass/style.sass */
.following-config-modal
{
margin-top: -100px;
}
.following-config-modal .modal-content
{
padding: 10px;
text-align: center;
}
.following-config-modal .modal-buttons
{
display: none;
}
.following-config-method-buttons .public-following {
background-color: #B4C669;
margin: 0px 2px;
padding: 6px 16px;
}
/********** RETWIST POSTS PROMPT ********* */
/********** RETWIST POSTS PROMPT **********/
/* line 705, ../sass/style.sass */
.reTwist.prompt-wrapper {
margin-top: -110px;
}
.reTwist .modal-content
{
.reTwist .modal-content {
padding: 20px 15px;
}
.reTwist button.modal-propagate
{
.reTwist button.modal-propagate {
background-color: #B4C669;
}
/* line 709, ../sass/style.sass */
.reTwist .post-expand, .reTwist .post-interactions {
display: none;
}
/********* REPLY POSTS MODAL************** */
/********* REPLY POSTS PROMPT ***************/
/* line 715, ../sass/style.sass */
.reply.prompt-wrapper {
margin-top: -110px;
@ -2813,38 +2798,37 @@ ol.toptrends-list a:hover {
}
/****** DIRECT MESSAGES MODAL********* */
/* line 736, ../sass/style.sass */
.modal-wrapper.directMessages {
top: 10%;
width: 520px;
height: 600px;
overflow-x: hidden;
margin: 0 0 0 -260px;
}
/* line 743, ../sass/style.sass */
.directMessages .modal-content {
width: 520px;
height: 560px;
overflow-y: auto;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
/* line 727, ../sass/style.sass */
.directMessages .post-area-new {
display: none;
margin: 0 -20px;
padding: 20px;
z-index: 5;
background: #E2E1DE;
}
/* line 734, ../sass/style.sass */
.directMessages .post-area-new .modal-header h3 span {
display: inline !important;
}
/* line 736, ../sass/style.sass */
.directMessages .modal-wrapper {
width: 520px;
height: 490px;
top: 10%;
margin: 0 0 0 -260px;
overflow-x: hidden;
}
/* line 743, ../sass/style.sass */
.directMessages .modal-content {
overflow-y: auto;
height: 300px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
width: 520px;
}
/* line 750, ../sass/style.sass */
.directMessages .modal-buttons {
display: none;
}
/* line 752, ../sass/style.sass */
.directMessages .post-photo {
height: 48px;
@ -2970,21 +2954,19 @@ ol.toptrends-list a:hover {
}
/********* NEW USER MODAL************* */
/* line 861, ../sass/style.sass */
.new-user .modal-wrapper {
width: 640px;
height: 600px;
top: 10%;
margin: 0 0 0 -320px;
overflow-x: hidden;
overflow-y: hidden;
.new-user.modal-wrapper {
width: 720px;
height: 580px;
margin: -290px 0 0 -360px;
}
/* line 868, ../sass/style.sass */
.new-user .modal-content {
margin: 10px 10px 10px 10px;
padding: 25px;
}
/* line 870, ../sass/style.sass */
.new-user .modal-buttons, .new-user .modal-close {
.new-user .modal-close {
display: none;
}
/* line 872, ../sass/style.sass */
@ -3006,22 +2988,19 @@ ol.toptrends-list a:hover {
/******** HASHTAG MODAL********** */
/* line 884, ../sass/style.sass */
.hashtag-modal .modal-wrapper {
.modal-wrapper.hashtag-modal {
top: 10%;
width: 520px;
height: 600px;
top: 10%;
margin: 0 0 0 -260px;
overflow: hidden;
margin: 0 0 0 -260px;
}
/* line 890, ../sass/style.sass */
.hashtag-modal .modal-content {
overflow-y: auto;
height: 500px;
}
/* line 893, ../sass/style.sass */
.hashtag-modal .modal-buttons {
display: none;
}
/* line 895, ../sass/style.sass */
.hashtag-modal .postboard {
padding: 0;
@ -3029,24 +3008,20 @@ ol.toptrends-list a:hover {
/****** CONVERSATION MODAL********** */
/* line 901, ../sass/style.sass */
.conversation-modal .modal-wrapper {
position: absolute;
.modal-wrapper.conversation-modal {
background: white;
top: 10%;
width: 520px;
height: 575px;
top: 10%;
margin: 0 0 0 -260px;
overflow: hidden;
background: white;
margin: 0 0 0 -260px;
}
/* line 909, ../sass/style.sass */
.conversation-modal .modal-content {
overflow-y: auto;
height: 90%;
}
/* line 912, ../sass/style.sass */
.conversation-modal .modal-buttons {
display: none;
}
/* line 914, ../sass/style.sass */
.conversation-modal .postboard {
padding: 0;
@ -3054,12 +3029,12 @@ ol.toptrends-list a:hover {
/****** FOLLOWING MODAL****** */
/* line 920, ../sass/style.sass */
.following-modal .modal-wrapper {
width: 520px;
.modal-wrapper.following-modal {
top: 10%;
width: 520px;
height: 400px;
margin: 0 0 0 -260px;
overflow-x: hidden;
margin: 0 0 0 -260px;
}
/* line 926, ../sass/style.sass */
.following-modal .modal-content {
@ -3067,10 +3042,7 @@ ol.toptrends-list a:hover {
overflow-y: auto;
padding: 0;
}
/* line 930, ../sass/style.sass */
.following-modal .modal-buttons {
display: none;
}
/* line 932, ../sass/style.sass */
.following-modal ol {
margin: 5px;
@ -3082,12 +3054,12 @@ ol.toptrends-list a:hover {
/******* WHO TO FOLLOW MODAL****** */
/* line 943, ../sass/style.sass */
.who-to-follow-modal .modal-wrapper {
width: 520px;
.modal-wrapper.who-to-follow-modal {
top: 50%;
width: 520px;
height: 555px;
margin: -275px 0 0 -260px;
overflow-x: hidden;
margin: -275px 0 0 -260px;
}
/* line 949, ../sass/style.sass */
.who-to-follow-modal .modal-content {
@ -3095,10 +3067,7 @@ ol.toptrends-list a:hover {
height: 480px;
overflow-y: auto;
}
/* line 953, ../sass/style.sass */
.who-to-follow-modal .modal-buttons {
display: none;
}
/* line 955, ../sass/style.sass */
.who-to-follow-modal ol {
margin: 5px;
@ -3313,9 +3282,9 @@ ul.dropdown-menu .active, ul.dropdown-menu .active a {
}
@media (max-width: 900px) {
/* line 21, ../sass/_responsive.sass */
.profile-modal .modal-wrapper {
margin-left: 0;
.modal-wrapper.profile-modal {
left: 1%;
margin-left: 0;
}
}
@media (max-width: 600px) {

14
theme_nin/js/theme_option.js
View File

@ -30,13 +30,13 @@ $(function(){
$('#postboard-top').addClass(promotedPostsOnly ? "hide" : "show");
});
$(window).scroll(function(){
posScroll = $(document).scrollTop();
if(posScroll >= 250)
$('.left .post-area-new').slideDown(300);
else
$('.left .post-area-new').slideUp(150);
});
$(window).scroll((function(){
if ($(document).scrollTop() >= 250) {
if (this.css('display') === 'none')
this.slideDown(300);
} else if (this.css('display') === 'block')
this.slideUp(150);
}).bind($('.left .post-area-new')));
$(".userMenu-search-profiles .follow")
.on("eventToggleFollow", function() {

220
theme_nin/sass/style.sass
View File

@ -15,14 +15,14 @@
.promoted-posts-only
margin: 0 0
@extend .clear-fix
float: right
li
li
cursor: pointer
display: inline-block
margin: 0 0 0 5px
@ -55,7 +55,7 @@
min-height: 100%
.dashboard
&.left, &.right
&.left, &.right
width: $column-width
position: fixed
top: 0
@ -87,13 +87,13 @@
.direct-messages, .dropdown-menu-item
display: block
padding: 10px
ul.userMenu-search-profiles
width: 100%
padding: 0
background: white
li
li
float: none
display: block
padding: 5px 10px
@ -108,7 +108,7 @@ ul.userMenu-search-profiles
.mini-profile-photo
width: 30px
height: 30px
margin: 0 10px 0 0
margin: 0 10px 0 0
float: left
.mini-profile-info
width: 100%
@ -170,7 +170,7 @@ ul.userMenu-search-profiles
position: relative
text-align: center
background: $bloc-background-color
a.button
a.button
background: $main-color-light
margin: 1em auto
.post-area
@ -198,7 +198,7 @@ ul.userMenu-search-profiles
float: left
font-size: .8em
position: relative
padding: 0
padding: 0
a
position: relative
color: $dark-grey
@ -208,7 +208,7 @@ ul.userMenu-search-profiles
padding: 1em 0
&:hover
background-color: white
&:before
font-size: 2.2em
display: block!important
@ -237,7 +237,7 @@ ul.userMenu-search-profiles
font-size: .8em
font-weight: 700
border-radius: 2px
.mini-profile-view
display: none
@ -299,7 +299,7 @@ ul.userMenu-search-profiles
.mini-profile-info a:hover
text-decoration: none
.who-follow
.who-follow
display: block
position: absolute
bottom: 50px
@ -309,7 +309,7 @@ ul.userMenu-search-profiles
background: lighten($background-light, 5%)
z-index: 10
+transition(all .2s linear)
.show-more-followers
font-weight: 700
display: block
@ -323,13 +323,13 @@ ul.userMenu-search-profiles
line-height: 12px
&.isFollowing:after
display: none
&:after
&:after
content: '·'
font-weight: 900
color: $main-color-dark
margin-left: 1px
/***************** POST AREA ***************/
@ -354,7 +354,7 @@ ul.userMenu-search-profiles
&:focus
border-bottom: solid 2px $color-green
#postboard-top
#postboard-top
clear: both
position: relative
@extend .clear-fix
@ -363,9 +363,9 @@ ul.userMenu-search-profiles
padding: 10px 10px 5px 10px
background: white
overflow: hidden
&.hide
&.hide
display: none!important
&.show
&.show
display: block
.profile-photo
@ -375,7 +375,7 @@ ul.userMenu-search-profiles
width: 48px
height: 48px
overflow: hidden
img
img
width: 100%
.post-area
overflow: hidden
@ -423,7 +423,7 @@ textarea.splited-post
padding-right: 3px
&.warn
color: #ff0000
@ -435,11 +435,11 @@ textarea.splited-post
&.module
width: inherit
margin-bottom: 20px
small
small
display: none
h3
h3
float: left
ol
ol
@extend .clear-fix
clear: both
.twister-user-info
@ -609,38 +609,28 @@ ol.toptrends-list
&.hover
cursor: pointer
/*********** POPUP PROMPT *************/
.prompt-wrapper
position: fixed
top: 50%
left: 50%
background: rgba( 255, 255,255, 1.0 )
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 )
z-index: 5
width: 600px
margin-left: -300px
/*********** POPUP MODAL **************/
.modal-blackout
position: fixed
width: 100%
height: 100%
left: 0
top: 0
background: rgba($main-color-light, 0.8)
display: none
z-index: 3
.modal-wrapper
position: absolute
background: white
z-index: 3
position: fixed
top: 50%
left: 50%
overflow: hidden
.post-area-new
padding: 10px
.modal-content
.modal-blackout
background: rgba($main-color-light, 0.8)
z-index: -1
position: fixed
left: 0
top: 0
width: 100%
height: 100%
.modal-content
@extend .clear-fix
background: $background-light
padding: 20px
@ -651,7 +641,7 @@ ol.toptrends-list
margin-left: -60px
width: 100px
width: $postboard-modal-width
span
span
display: none
.postboard-news
line-height: 30px
@ -662,7 +652,7 @@ ol.toptrends-list
display: block
padding: 0 20px
color: white
+text-shadow(1px 1px 1px rgba(black, .1))
+text-shadow(1px 1px 1px rgba(black, .1))
background: $main-color-color
@ -693,7 +683,7 @@ ol.toptrends-list
color: rgba(white, 0.7)
&:hover
color: white
b
b
display: none
.mark-all-as-read
@ -726,30 +716,37 @@ ol.toptrends-list
color: rgba(white, 0.7)
&:hover
color: white
b
b
display: none
.modal-buttons
padding: 10px
text-align: right
/*********** POPUP PROMPT *************/
.prompt-wrapper
background: rgba( 255, 255,255, 1.0 )
z-index: 5
position: fixed
top: 50%
left: 50%
width: 600px
margin-left: -300px
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 )
.modal-buttons
padding: 10px
text-align: right
button:last-child
padding: 5px 20px;
/************ FOLLOWING-CONFIG MODAL **********/
.following-config-modal
.prompt-wrapper.following-config-modal
margin-top: -100px
h2
text-transform: none
.modal-wrapper
top: 43%
left: 25%
width: 50%
.modal-content
padding: 10px
text-align: center
background-color: white
.modal-buttons
display: none
h2
text-transform: none
.following-config-method-buttons
.public-following
background-color: $color-green
@ -758,7 +755,7 @@ ol.toptrends-list
/************ RETWIST POSTS MODAL **********/
.reTwist
.prompt-wrapper.reTwist
&.prompt-wrapper
margin-top: -110px
.modal-content
@ -771,7 +768,7 @@ ol.toptrends-list
/********* REPLY POSTS MODAL***************/
.reply
.prompt-wrapper.reply
&.prompt-wrapper
margin-top: -110px
.modal-buttons, .post-expand, .post-interactions
@ -781,9 +778,15 @@ ol.toptrends-list
/****** DIRECT MESSAGES MODAL**********/
.directMessages
.modal-wrapper.directMessages
top: 10%
width: $postboard-modal-width
height: 490px
overflow-x: hidden
margin: 0 0 0 0-($postboard-modal-width/2)
.post-area-new
display: none
margin: 0 -20px
padding: 20px
z-index: 5
background: $main-background-color
@ -791,22 +794,14 @@ ol.toptrends-list
.modal-header
h3 span
display: inline!important
.modal-wrapper
width: $postboard-modal-width
height: 490px
top: 10%
margin: 0 0 0 0-($postboard-modal-width/2)
overflow-x: hidden
.modal-content
overflow-y: auto
height: 300px
+box-sizing(border-box)
width: $postboard-modal-width
.modal-buttons
display: none
.post-photo
height: 48px
width: 48px
@ -915,17 +910,13 @@ ol.toptrends-list
/********* NEW USER MODAL**************/
.new-user
.modal-wrapper
width: 640px
height: 600px
top: 10%
margin: 0 0 0 -320px
overflow-x: hidden
overflow-y: hidden
.modal-wrapper.new-user
width: 720px
height: 580px
margin: -290px 0 0 -360px
.modal-content
margin: 10px 10px 10px 10px
.modal-buttons, .modal-close
padding: 25px
.modal-close
display: none
.text
margin: 0 0 15px 0
@ -940,55 +931,45 @@ ol.toptrends-list
/******** HASHTAG MODAL***********/
.hashtag-modal
.modal-wrapper
width: $postboard-modal-width
height: 600px
top: 10%
margin: 0 0 0 0-($postboard-modal-width/2)
overflow: hidden
.modal-wrapper.hashtag-modal
top: 10%
width: $postboard-modal-width
height: 600px
overflow: hidden
margin: 0 0 0 0-($postboard-modal-width/2)
.modal-content
overflow-y: auto
height: 500px
.modal-buttons
display: none
.postboard
padding: 0
/****** CONVERSATION MODAL***********/
.conversation-modal
.modal-wrapper
position: absolute
width: $postboard-modal-width
height: 575px
top: 10%
margin: 0 0 0 0-($postboard-modal-width/2)
overflow: hidden
background: white
.modal-wrapper.conversation-modal
background: white
top: 10%
width: $postboard-modal-width
height: 575px
overflow: hidden
margin: 0 0 0 0-($postboard-modal-width/2)
.modal-content
overflow-y: auto
height: 90%
.modal-buttons
display: none
.postboard
padding: 0
/****** FOLLOWING MODAL*******/
.following-modal
.modal-wrapper
width: $postboard-modal-width
top: 10%
height: 400px
margin: 0 0 0 0-($postboard-modal-width/2)
overflow-x: hidden
.modal-wrapper.following-modal
top: 10%
width: $postboard-modal-width
height: 400px
overflow-x: hidden
margin: 0 0 0 0-($postboard-modal-width/2)
.modal-content
height: 300px
overflow-y: auto
padding: 0
.modal-buttons
display: none
ol
margin: 5px
.open-profile-modal
@ -999,19 +980,16 @@ ol.toptrends-list
/******* WHO TO FOLLOW MODAL*******/
.who-to-follow-modal
.modal-wrapper
width: $postboard-modal-width
top: 50%
height: 555px
margin: -275px 0 0 0-($postboard-modal-width/2)
overflow-x: hidden
.modal-wrapper.who-to-follow-modal
top: 50%
width: $postboard-modal-width
height: 555px
overflow-x: hidden
margin: -275px 0 0 0-($postboard-modal-width/2)
.modal-content
padding: 15px
height: 480px
overflow-y: auto
.modal-buttons
display: none
ol
margin: 5px
.open-profile-modal