Browse Source

big update

change files order, new DHT indicator in top menu, ‘back’ button in DM
conversations, sound notifications (alpha) and new page ‘Options’, few
fixes
master
Hedgehog 11 years ago
parent
commit
b54e611797
  1. 10
      calm.js
  2. 2
      css/profile.css
  3. 108
      css/style.css
  4. 86
      following.html
  5. 68
      home.html
  6. 0
      img/ajax-loader.gif
  7. 0
      img/dm.png
  8. 0
      img/ext-link.png
  9. 0
      img/form-arrow-down-black.png
  10. 0
      img/icons-18-black.png
  11. 0
      img/icons-18-white.png
  12. 0
      img/icons-36-black.png
  13. 0
      img/icons-36-white.png
  14. 0
      img/pen.png
  15. 122
      js/calm.js
  16. 0
      js/interface_common.js
  17. 0
      js/interface_home.js
  18. 4
      js/interface_localization.js
  19. 0
      js/interface_login.js
  20. 0
      js/interface_profile-edit.js
  21. 0
      js/jQueryPlugins.js
  22. 0
      js/jpeg_encoder_basic.js
  23. 0
      js/jquery-1.9.1.min.js
  24. 0
      js/jquery.animate-colors-min.js
  25. 0
      js/jquery.json-2.4.js
  26. 0
      js/jquery.jsonrpcclient.js
  27. 0
      js/jquery.min.js
  28. 0
      js/jquery.mobile-1.3.2.min.js
  29. 0
      js/jquery.mobile.router.min.js
  30. 0
      js/jquery.storageapi.js
  31. 1
      js/mobile_abstract.js
  32. 3
      js/options.js
  33. 0
      js/polyglot.min.js
  34. 0
      js/qrcode.js
  35. 0
      js/tmobile.js
  36. 0
      js/twister_actions.js
  37. 1
      js/twister_directmsg.js
  38. 0
      js/twister_following.js
  39. 0
      js/twister_formatpost.js
  40. 0
      js/twister_io.js
  41. 1
      js/twister_network.js
  42. 5
      js/twister_newmsgs.js
  43. 3
      js/twister_timeline.js
  44. 0
      js/twister_user.js
  45. 38
      login.html
  46. 54
      network.html
  47. 84
      options.html
  48. 69
      profile-edit.html
  49. BIN
      sound/1.mp3
  50. BIN
      sound/1.ogg
  51. BIN
      sound/1.wav
  52. BIN
      sound/2.mp3
  53. BIN
      sound/2.ogg
  54. BIN
      sound/2.wav
  55. BIN
      sound/3.mp3
  56. BIN
      sound/3.ogg
  57. BIN
      sound/3.wav
  58. BIN
      sound/4.mp3
  59. BIN
      sound/4.ogg
  60. BIN
      sound/4.wav
  61. BIN
      sound/5.mp3
  62. BIN
      sound/5.ogg
  63. BIN
      sound/5.wav
  64. 10
      tmobile.html

10
calm.js

@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
$(function(){
$('.post-text').on('click', 'a', function(e){
e.stopPropagation();
});
$(".cancel").on('click', function(e){
if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")};
})
})

2
css/profile.css

@ -41,8 +41,6 @@ @@ -41,8 +41,6 @@
height: 74px;
border: solid 3px #45474d;
border-radius: 10%;
/* border-top-right-radius: 0;
border-bottom-left-radius: 0;*/
box-sizing: content-box;
float:left;
top: 50%;

108
css/style.css

@ -145,15 +145,6 @@ button.disabled:hover @@ -145,15 +145,6 @@ button.disabled:hover
background: #43464d;
z-index: -999;
}
/*.userMenu:after
{
content: "";
position: absolute;
right: 0;
width: 34px;
height: 54px;
background: url(../img/twister_mini.png) no-repeat right 5px;
}*/
.userMenu > ul
{
}
@ -238,7 +229,19 @@ button.disabled:hover @@ -238,7 +229,19 @@ button.disabled:hover
{
background: url(../img/following.png) no-repeat 5px center #768fce;
}
.userMenu li.userMenu-options > a
{
background: url(../img/following.png) no-repeat 5px center;
padding-left: 50px;
}
.userMenu li.userMenu-options:hover > a
{
background: url(../img/following.png) no-repeat 5px center rgba( 0, 0, 0 , .4 );
}
.userMenu li.userMenu-options.current > a
{
background: url(../img/following.png) no-repeat 5px center #768fce;
}
.userMenu li.userMenu-messages > a
{
background: url(../img/messages.png) no-repeat center center;
@ -270,7 +273,6 @@ button.disabled:hover @@ -270,7 +273,6 @@ button.disabled:hover
{
float: right;
position: relative;
/* margin-right: 40px;*/
}
.userMenu li.userMenu-search
{
@ -323,6 +325,44 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -323,6 +325,44 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
{
background: url(../img/config.png) no-repeat 5px center rgba( 0, 0, 0 , .4 );
}
.userMenu li.userMenu-dhtindicator {
background: #000;
width: 70px;
height: 25px;
float: right;
margin: 7px 10px 0 0;
-webkit-box-shadow: inset 0 0 20px #000;
-moz-box-shadow: inset 0 0 20px #000;
box-shadow: inset 0 0 20px #000;
-webkit-transition: all 200ms;
-moz-transition: all 200ms;
-ms-transition: all 200ms;
-o-transition: all 200ms;
transition: all 200ms;
border-radius: 10px;
}
.userMenu li.userMenu-dhtindicator a {
display: inline-block;
font: 12px/25px "Open Sans", sans-serif;
padding: 0 0 0 45px;
width: 60px;
height: 25px;
opacity: .9;
}
.userMenu li.userMenu-dhtindicator a:before {
content: 'DHT:';
display: inline-block;
position: absolute;
left: 10px;
width: 70px;
height: 25px;
}
.userMenu li.userMenu-dhtindicator:hover {
opacity: 1;
-webkit-box-shadow: inset 0 0 15px #000;
-moz-box-shadow: inset 0 0 15px #000;
box-shadow: inset 0 0 15px #000;
}
.userMenu li.userMenu-messages > a:empty
{
padding: 0 20px 0 30px;
@ -659,14 +699,14 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -659,14 +699,14 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
}
.directMessages .dm-submit {
margin-right: 55px;
background: #6d83bd url(images/dm.png) no-repeat 10px 3px;
background: #6d83bd url(../img/dm.png) no-repeat 10px 3px;
}
.post .post-submit {
margin-right: 16px;
background: #6d83bd url(images/pen.png) no-repeat 10px 3px;
background: #6d83bd url(../img/pen.png) no-repeat 10px 3px;
}
.mini-profile .post-submit {
background: #6d83bd url(images/pen.png) no-repeat 10px 3px;
background: #6d83bd url(../img/pen.png) no-repeat 10px 3px;
margin-right: 0;
}
.post-submit.disabled {
@ -1033,7 +1073,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -1033,7 +1073,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
top: 3px;
width: 16px;
height: 16px;
background: url(images/ext-link.png) no-repeat center center;
background: url(../img/ext-link.png) no-repeat center center;
opacity: 1;
zoom: .8;
-moz-transform: scale(.8);
@ -1351,13 +1391,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -1351,13 +1391,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
/*************************************
**************************** LOGIN PAGE
**************************************/
.login .module {
.login .module, .sounds .module {
padding: 20px;
width: 500px;
margin: 10px auto;
border: 5px solid #c7cdda;
}
.login .module p {
.login .module p, .sounds .module p {
font: 14px "Open Sans", sans-serif;
margin-bottom: 5px;
@ -1374,13 +1414,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -1374,13 +1414,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
background: #fff;
transition: background-color 100ms linear;
}
.login .module select.local-usernames {
.login .module select.local-usernames, .sndOpt {
height: 30px;
font: 13px/24px "Open sans";
text-align: center;
padding: 3px 30px 3px 10px;
margin: 0;
background: #fff url(images/form-arrow-down-black.png) no-repeat right center;
background: #fff url(../img/form-arrow-down-black.png) no-repeat right center;
border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
@ -1471,6 +1511,23 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -1471,6 +1511,23 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-back {
position: absolute;
right: 30px;
top: 0;
padding: 3px 10px;
cursor: pointer;
color: rgba( 255, 255, 255, .7 );
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
display: none;
}
.modal-back:hover
{
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-buttons
{
padding: 10px;
@ -1819,3 +1876,16 @@ input.userMenu-search-field:focus::-ms-input-placeholder { @@ -1819,3 +1876,16 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
left: 2px;
}
}
/* Options */
#playerVol {
float: right;
margin-right: 20px;
}
.volValue {
float: right;
margin-right: -163px;
font: 12px "Open Sans", sans-serif;
}
#notifyForm p {
margin-top: 15px;
}

86
following.html

@ -5,23 +5,24 @@ @@ -5,23 +5,24 @@
<title>Following</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<link rel="stylesheet" href="css/profile.css" type="text/css"/>
<script src="jquery.min.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="polyglot.min.js"></script>
<script src="interface_localization.js"></script>
<script src="twister_network.js"></script>
<script src="twister_user.js"></script>
<script src="twister_formatpost.js"></script>
<script src="twister_newmsgs.js"></script>
<script src="twister_following.js"></script>
<script src="twister_directmsg.js"></script>
<script src="twister_actions.js"></script>
<script src="interface_common.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/twister_formatpost.js"></script>
<script src="js/twister_newmsgs.js"></script>
<script src="js/twister_following.js"></script>
<script src="js/twister_directmsg.js"></script>
<script src="js/twister_actions.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/options.js"></script>
<script>
$(document).ready(function()
@ -40,62 +41,19 @@ @@ -40,62 +41,19 @@
<ul>
<li class="userMenu-home"><a href="home.html"></a></li>
<li class="userMenu-following current"><a href="following.html">Following</a></li>
<!-- <li class="userMenu-network"><a href="network.html">Network</a></li>
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> -->
<li class="userMenu-config current">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<!-- <div class="mini-profile-info">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span>
</div> -->
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
<!-- <a class="direct-messages" href="#">Direct Messages</a> -->
</div>
</a>
</li>
<!-- <li class="userMenu-connections">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li>
<li class="userMenu-messages">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li> -->
<!-- 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>
<li><a href="#">Outro Fulano</a></li>
<li><a href="#">Mais outro</a></li>
</ul>
<ul class="userMenu-search-profiles">
<li id="search-profile-template" style="display: none;">
<div class="mini-profile-info" data-screen-name="">
<a href="#" class="open-profile-modal">
<img class="mini-profile-photo" src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/>
<span class="mini-screen-name">@<b></b></span>
<span class="mini-profile-name"></span>
</a>
<button class="follow">Follow</button>
</div>
</li>
</ul>
</div>
</li>
</ul>
</nav>
<!-- MENU SUPERIOR END -->
@ -199,9 +157,9 @@ @@ -199,9 +157,9 @@
<p class="post-text"></p>
<div class="post-context" style="display: none;">
<i class="post-retransmited-icon"></i>
<span>Retransmitted by
<span>twisted again by</span>
<a class="post-retransmited-by open-profile-modal" href=""></a>
</span>
</div>
<span class="post-expand">Expand</span>
<!-- elementos de interação com o post que são exibidos no hover -->

68
home.html

@ -5,27 +5,29 @@ @@ -5,27 +5,29 @@
<title>twister</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<link rel="stylesheet" href="css/profile.css" type="text/css"/>
<script src="jquery.min.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="polyglot.min.js"></script>
<script src="interface_localization.js"></script>
<script src="twister_network.js"></script>
<script src="twister_user.js"></script>
<script src="twister_formatpost.js"></script>
<script src="twister_following.js"></script>
<script src="twister_timeline.js"></script>
<script src="twister_newmsgs.js"></script>
<script src="twister_actions.js"></script>
<script src="twister_directmsg.js"></script>
<script src="interface_common.js"></script>
<script src="interface_home.js"></script>
<script src="jquery.animate-colors-min.js"></script>
<script src="calm.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/twister_formatpost.js"></script>
<script src="js/twister_following.js"></script>
<script src="js/twister_timeline.js"></script>
<script src="js/twister_newmsgs.js"></script>
<script src="js/twister_actions.js"></script>
<script src="js/twister_directmsg.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_home.js"></script>
<script src="js/jquery.animate-colors-min.js"></script>
<script src="js/calm.js"></script>
<script src="js/options.js"></script>
<script>$(function(){setInterval("networkUpdate()", 2000); homeIntInit ();})</script>
<link rel="icon" type="image/png" href="img/twister_mini.png" />
</head>
@ -36,35 +38,28 @@ @@ -36,35 +38,28 @@
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="#"></a></li>
<!-- <li class="userMenu-network"><a href="network.html">Network</a></li>
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> -->
<li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<!-- <div class="mini-profile-info">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span>
</div> -->
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
<!-- <a class="dropdown-menu-item promoted-posts-only" href="#">Switch to Promoted posts</a> -->
<!-- <a class="direct-messages dropdown-menu-item" href="#">Direct Messages</a> -->
</div>
</a>
</li>
<li class="userMenu-connections">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
<span class="messages-qtd" style="display:none;">0</span>
</a>
</li>
<li class="userMenu-messages">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
<span class="messages-qtd" style="display:none;">0</span>
</a>
</li>
<li class="userMenu-dhtindicator"><a href="network.html"></a></li>
<!-- BUSCA -->
<li class="userMenu-search">
@ -219,7 +214,8 @@ @@ -219,7 +214,8 @@
<p class="post-text"></p>
<div class="post-context" style="display: none;">
<i class="post-retransmited-icon"></i>
<span>Retransmitted by</span><a class="post-retransmited-by open-profile-modal" href=""></a>
<span>twisted again by</span>
<a class="post-retransmited-by open-profile-modal" href=""></a>
</div>
<span class="post-expand">Expand</span>
<!-- elementos de interação com o post que são exibidos no hover -->
@ -276,6 +272,7 @@ @@ -276,6 +272,7 @@
<div class="modal-header">
<h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back"><</span>
</div>
<div class="modal-content"></div>
<div class="modal-buttons">
@ -442,6 +439,7 @@ @@ -442,6 +439,7 @@
</div>
<!-- TEMPLATES END -->
<audio id="player"></audio>
<audio id="playerSec"></audio>
</body>
</html>

0
css/images/ajax-loader.gif → img/ajax-loader.gif

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
css/images/dm.png → img/dm.png

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 475 B

0
css/images/ext-link.png → img/ext-link.png

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

0
css/images/form-arrow-down-black.png → img/form-arrow-down-black.png

Before

Width:  |  Height:  |  Size: 134 B

After

Width:  |  Height:  |  Size: 134 B

0
css/images/icons-18-black.png → img/icons-18-black.png

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
css/images/icons-18-white.png → img/icons-18-white.png

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
css/images/icons-36-black.png → img/icons-36-black.png

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
css/images/icons-36-white.png → img/icons-36-white.png

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
css/images/pen.png → img/pen.png

Before

Width:  |  Height:  |  Size: 511 B

After

Width:  |  Height:  |  Size: 511 B

122
js/calm.js

@ -0,0 +1,122 @@ @@ -0,0 +1,122 @@
$(function(){
$('.post-text').on('click', 'a', function(e){
e.stopPropagation();
});
$('#showqr').on('click', function(){
if($('#qrcode img')[0]) return;
var skey = document.getElementById('skey').innerText;
new QRCode(document.getElementById("qrcode"), skey);
});
function dhtIndicatorBg(){
var bgcolor = '';
if(twisterDhtNodes <= 10){bgcolor = '#770900'
}else if(twisterDhtNodes <= 20){bgcolor = '#773400'
}else if(twisterDhtNodes <= 30){bgcolor = '#774c00'
}else if(twisterDhtNodes <= 40){bgcolor = '#776400'
}else if(twisterDhtNodes <= 50){bgcolor = '#707500'
}else if(twisterDhtNodes <= 60){bgcolor = '#3f6900'
}else if(twisterDhtNodes <= 70){bgcolor = '#005f15'
}else if(twisterDhtNodes >= 71){bgcolor = '#009922'
}
$('.userMenu-dhtindicator').animate({'background-color': bgcolor });
};
setTimeout(dhtIndicatorBg, 300);
setTimeout(function() {setInterval(dhtIndicatorBg, 2000)}, 400);
})
function modalDMIntr () {
$(".cancel").on('click', function(event){
if(!$(event.target).hasClass("cancel")) return;
if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")};
$('.modal-back').css('display', 'none');
});
$('.modal-back').on('click', function(){
if($('.modal-content .direct-messages-list')[0]) return;
directMessagesPopup();
$(".modal-content").removeAttr("style");
});
};
//sound notifications
function soundNotifOptions () {
if(!localStorage['sndDM']) localStorage['sndDM'] = false;
if(!localStorage['sndMention']) localStorage['sndMention'] = false;
$('#notifyForm select').each(function(){
this.value = localStorage[this.id];
});
var player = $('#player');
player[0].pause();
$('#player').empty();
$('form#notifyForm').on('change','select',function(){
localStorage.setItem(this.id, this.value);
if(this.value == false) {player[0].pause(); return;}
if (player[0].canPlayType('audio/mpeg;')) {
player.attr('type', 'audio/mpeg');
player.attr('src', 'sound/'+this.value+'.mp3');
} else {
player.attr('type', 'audio/ogg');
player.attr('src', 'sound/'+this.value+'.ogg');
}
player[0].play();
});
}
function volumeControl () {
var playerVol = $('#playerVol');
playerVol[0].value = localStorage[playerVol[0].id] ? localStorage[playerVol[0].id] : 100;
$('.volValue').text((localStorage[playerVol[0].id] * 100).toFixed());
playerVol.on('change',function(){
localStorage.setItem(this.id, this.value);
$('#player')[0].volume = (this.value);
$('.volValue').text((this.value * 100).toFixed());
});
}
function DMsNotif() {
if(localStorage['sndDM'] == "false") return;
var player = $('#player');
$('#player').empty();
if (player[0].canPlayType('audio/mpeg;')) {
player.attr('type', 'audio/mpeg');
player.attr('src', 'sound/'+localStorage['sndDM']+'.mp3');
} else {
player.attr('type', 'audio/ogg');
player.attr('src', 'sound/'+localStorage['sndDM']+'.ogg');
}
player[0].volume = localStorage['playerVol'];
player[0].play();
// setTimeout('player[0].pause', 1000);
}
function mensNotif() {
if(localStorage['sndMention'] == "false") return;
var player = $('#player');
$('#playerSec').empty();
if (player[0].canPlayType('audio/mpeg;')) {
player.attr('type', 'audio/mpeg');
player.attr('src', 'sound/'+localStorage['sndMention']+'.mp3');
} else {
player.attr('type', 'audio/ogg');
player.attr('src', 'sound/'+localStorage['sndMention']+'.ogg');
}
player[0].volume = localStorage['playerVol'];
player[0].play();
// setTimeout('player[0].pause', 1000);
};
function InitOptions () {
soundNotifOptions();
volumeControl();
}
function homeIntInit () {
modalDMIntr ();
}

0
interface_common.js → js/interface_common.js

0
interface_home.js → js/interface_home.js

4
interface_localization.js → js/interface_localization.js

@ -108,7 +108,7 @@ if(preferredLanguage == "en"){ @@ -108,7 +108,7 @@ if(preferredLanguage == "en"){
"reply_to": "Reply to %{fullname}",
"Retransmit": "Retransmit",
"Retransmits": "Retransmits",
"Retransmitted by": "Retransmitted by ",
"twisted again by": "twisted again by ",
"search": "search",
"seconds": "%{smart_count} second |||| %{smart_count} seconds",
"send": "send",
@ -825,7 +825,7 @@ if(preferredLanguage == "ru"){ @@ -825,7 +825,7 @@ if(preferredLanguage == "ru"){
"reply_to": "Ответить %{fullname}",
"Retransmit": "Перепостить",
"Retransmits": "Репосты",
"Retransmitted by": "Перепощено ",
"twisted again by": "Перепостил ",
"search": "поиск",
"seconds": "%{smart_count} секунда |||| %{smart_count} секунд",
"send": "отправить",

0
interface_login.js → js/interface_login.js

0
interface_profile-edit.js → js/interface_profile-edit.js

0
jQueryPlugins.js → js/jQueryPlugins.js

0
jpeg_encoder_basic.js → js/jpeg_encoder_basic.js

0
jquery-1.9.1.min.js → js/jquery-1.9.1.min.js vendored

0
jquery.animate-colors-min.js → js/jquery.animate-colors-min.js vendored

0
jquery.json-2.4.js → js/jquery.json-2.4.js

0
jquery.jsonrpcclient.js → js/jquery.jsonrpcclient.js

0
jquery.min.js → js/jquery.min.js vendored

0
jquery.mobile-1.3.2.min.js → js/jquery.mobile-1.3.2.min.js vendored

0
jquery.mobile.router.min.js → js/jquery.mobile.router.min.js vendored

0
jquery.storageapi.js → js/jquery.storageapi.js

1
mobile_abstract.js → js/mobile_abstract.js

@ -257,6 +257,7 @@ var MAL = function() @@ -257,6 +257,7 @@ var MAL = function()
if( newDMs ) {
$DMsCounter.text(newDMs);
$DMsCounter.fadeIn();
// DMsNotif();
} else {
$DMsCounter.hide();
}

3
js/options.js

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
$(function() {
});

0
polyglot.min.js → js/polyglot.min.js vendored

0
qrcode.js → js/qrcode.js

0
tmobile.js → js/tmobile.js

0
twister_actions.js → js/twister_actions.js

1
twister_directmsg.js → js/twister_directmsg.js

@ -120,6 +120,7 @@ function directMessagesPopup() @@ -120,6 +120,7 @@ function directMessagesPopup()
$( ".directMessages h3" ).text( polyglot.t("Direct Messages") );
requestDMsnippetList($(".directMessages").find(".direct-messages-list"));
$('.modal-back').css('display','inline');
}

0
twister_following.js → js/twister_following.js

0
twister_formatpost.js → js/twister_formatpost.js

0
twister_io.js → js/twister_io.js

1
twister_network.js → js/twister_network.js

@ -30,6 +30,7 @@ function requestNetInfo(cbFunc, cbArg) { @@ -30,6 +30,7 @@ function requestNetInfo(cbFunc, cbArg) {
$(".known-peers").text(twisterdAddrman);
$(".blocks").text(twisterdBlocks);
$(".dht-nodes").text(twisterDhtNodes);
$(".userMenu-dhtindicator a").text(twisterDhtNodes);
$(".version").text(twisterDisplayVersion);
if( !twisterdConnections ) {

5
twister_newmsgs.js → js/twister_newmsgs.js

@ -19,6 +19,7 @@ function processMention(user, mentionTime, data) { @@ -19,6 +19,7 @@ function processMention(user, mentionTime, data) {
console.log("mention from the future will be ignored");
} else {
if( !(key in _knownMentions) ) {
mensNotif(); // sound notification
// mention must be somewhat recent compared to last known one to be considered new
if( mentionTime + 3600 > _lastMentionTime ) {
_newMentions++;
@ -149,13 +150,15 @@ function requestDMsCount() { @@ -149,13 +150,15 @@ function requestDMsCount() {
}
function getNewDMsCount() {
var newDMs = 0;
var newDMs = 0, key, reslt;
for( var key in _newDMsPerUser ) {
if( _newDMsPerUser.hasOwnProperty(key) ) {
newDMs += _newDMsPerUser[key];
}
}
for (key in _newDMsPerUser){if(_newDMsPerUser[key] * 1)reslt = true};
if(newDMs > 0 && reslt) DMsNotif(); //sound notification
return newDMs;
}

3
twister_timeline.js → js/twister_timeline.js

@ -103,8 +103,7 @@ function requestObj(users, mode, count, getspam) @@ -103,8 +103,7 @@ function requestObj(users, mode, count, getspam)
this.reportProcessedPost = function(user, id, shown) {
if( this.getspam ) {
_idTrackerSpam.receivedId(this.mode, id, shown);
}
if( this.users.indexOf(user) >= 0 ) {
} else if( this.users.indexOf(user) >= 0 ) {
_idTrackerMap[user].receivedId(this.mode, id, shown);
}
}

0
twister_user.js → js/twister_user.js

38
login.html

@ -4,19 +4,20 @@ @@ -4,19 +4,20 @@
<meta charset="utf-8"/>
<title>twister login</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<script src="jquery.min.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="twister_network.js"></script>
<script src="twister_user.js"></script>
<script src="interface_common.js"></script>
<script src="interface_login.js"></script>
<script src="polyglot.min.js"></script>
<script src="interface_localization.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_login.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/options.js"></script>
<script>
$(document).ready(function()
@ -34,22 +35,15 @@ @@ -34,22 +35,15 @@
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"></a></li>
<!-- <li class="userMenu-network"><a href="network.html">Network</a></li> -->
<li class="userMenu-profile current"><a href="login.html">Login</a></li>
<li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<!-- <div class="mini-profile-info">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span>
</div> -->
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
<!-- <a class="dropdown-menu-item promoted-posts-only" href="#">Switch to Promoted posts</a>
<a class="direct-messages dropdown-menu-item" href="#">Direct Messages</a> -->
</div>
</a>
</li>

54
network.html

@ -4,21 +4,22 @@ @@ -4,21 +4,22 @@
<meta charset="utf-8"/>
<title>Network status</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<script src="jquery.min.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="twister_user.js"></script>
<script src="twister_formatpost.js"></script>
<script src="twister_following.js"></script>
<script src="twister_newmsgs.js"></script>
<script src="polyglot.min.js"></script>
<script src="interface_localization.js"></script>
<script src="twister_network.js"></script>
<script src="interface_common.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/twister_formatpost.js"></script>
<script src="js/twister_following.js"></script>
<script src="js/twister_newmsgs.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/options.js"></script>
<script>
$(document).ready(function()
@ -37,36 +38,17 @@ @@ -37,36 +38,17 @@
<ul>
<li class="userMenu-home"><a href="home.html"></a></li>
<li class="userMenu-network current"><a href="network.html">Network</a></li>
<!-- <li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> -->
<li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<!-- <div class="mini-profile-info">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span>
</div> -->
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
<!-- <a class="direct-messages" href="#">Direct Messages</a> -->
</div>
</a>
</li>
<!-- <li class="userMenu-connections">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li>
<li class="userMenu-messages">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li>
<li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search"/>
</li>-->
</ul>
</nav>
<!-- MENU SUPERIOR END -->

84
options.html

@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>twister login</title>
<link rel="stylesheet" href="css/style.css" type="text/css"/>
<script src="js/jquery.min.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_login.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/calm.js"></script>
<script src="js/options.js"></script>
<script>$(function(){
initInterfaceCommon();
InitOptions();})
</script>
</head>
<body>
<!-- MENU SUPERIOR INIT -->
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"></a></li>
<li class="userMenu-options current"><a href="options.html">Options</a></li>
<li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
</div>
</a>
</li>
</ul>
</nav>
<div class="wrapper">
<div class="sounds">
<div class="module">
<p> Sound notifications </p>
<div>
<form action="" id="notifyForm">
<p>Mentions</p>
<select name="" id="sndMention" class="sndOpt">
<option value="false">none</option>
<option value="1">beat</option>
<option value="2">pip</option>
<option value="3">vibro</option>
<option value="4">flip</option>
<option value="5">click</option>
</select><br>
<p>Direct messages</p>
<select name="" id="sndDM" class="sndOpt">
<option value="false">none</option>
<option value="1">beat</option>
<option value="2">pip</option>
<option value="3">vibro</option>
<option value="4">flip</option>
<option value="5">click</option>
</select>
<input type="range" name="playerVol" id="playerVol" min="0" max="1" step="0.01"><span class="volValue">0</span>
</form>
<audio id="player"></audio>
</div>
</div>
</body>
</html>

69
profile-edit.html

@ -4,22 +4,24 @@ @@ -4,22 +4,24 @@
<title>Edit profile</title>
<link rel="stylesheet" href="css/style.css" type="text/css">
<link rel="stylesheet" href="css/profile.css" type="text/css">
<script src="jquery.min.js"></script>
<script type="text/javascript" src="qrcode.js"></script>
<script src="jQueryPlugins.js"></script>
<script src="jquery.json-2.4.js"></script>
<script src="jquery.jsonrpcclient.js"></script>
<script src="jquery.storageapi.js"></script>
<script src="mobile_abstract.js"></script>
<script src="twister_io.js"></script>
<script src="polyglot.min.js"></script>
<script src="interface_localization.js"></script>
<script src="twister_user.js"></script>
<script src="twister_network.js"></script>
<script src="twister_following.js"></script>
<script src="twister_newmsgs.js"></script>
<script src="interface_common.js"></script>
<script src="interface_profile-edit.js"></script>
<script src="js/jquery.min.js"></script>
<script type="text/javascript" src="js/qrcode.js"></script>
<script src="js/jQueryPlugins.js"></script>
<script src="js/jquery.json-2.4.js"></script>
<script src="js/jquery.jsonrpcclient.js"></script>
<script src="js/jquery.storageapi.js"></script>
<script src="js/mobile_abstract.js"></script>
<script src="js/twister_io.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_following.js"></script>
<script src="js/twister_newmsgs.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_profile-edit.js"></script>
<script src="js/calm.js"></script>
<script src="js/options.js"></script>
<script>
$(document).ready(function()
@ -37,37 +39,18 @@ @@ -37,37 +39,18 @@
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"></a></li>
<!-- <li class="userMenu-network"><a href="network.html">Network</a></li> -->
<li class="userMenu-profile current"><a href="profile-edit.html">Profile</a></li>
<li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal">
<!-- <div class="mini-profile-info">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
<a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span>
</div> -->
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item" href="following.html">Following users</a>
<a class="dropdown-menu-item" href="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a>
<!-- <a class="direct-messages" href="#">Direct Messages</a> -->
</div>
</a>
</li>
<!-- <li class="userMenu-connections">
<a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li>
<li class="userMenu-messages">
posts <a href="#">
<span class="messages-qtd" style="display:none;">12</span>
</a>
</li>
<li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search">
</li> -->
</ul>
</nav>
<!-- MENU SUPERIOR END -->
@ -94,21 +77,11 @@ @@ -94,21 +77,11 @@
<div style="font-size:80%;text-align: center;" class="secret-key-container">
<span class="label">Secret key:</span> <div id="skey"><span class="secret-key"></span></div>
<button href="#" onclick="showqr()">Show QR code</button>
<button href="#" id="showqr">Show QR code</button>
</div>
<script>
function showqr ()
{
var skey = document.getElementById('skey').innerText;
new QRCode(document.getElementById("qrcode"), skey);
}
</script>
<div align="center" id="qrcode"></div>
</div>
<!-- ÁREA DE POSTS END -->

BIN
sound/1.mp3

Binary file not shown.

BIN
sound/1.ogg

Binary file not shown.

BIN
sound/1.wav

Binary file not shown.

BIN
sound/2.mp3

Binary file not shown.

BIN
sound/2.ogg

Binary file not shown.

BIN
sound/2.wav

Binary file not shown.

BIN
sound/3.mp3

Binary file not shown.

BIN
sound/3.ogg

Binary file not shown.

BIN
sound/3.wav

Binary file not shown.

BIN
sound/4.mp3

Binary file not shown.

BIN
sound/4.ogg

Binary file not shown.

BIN
sound/4.wav

Binary file not shown.

BIN
sound/5.mp3

Binary file not shown.

BIN
sound/5.ogg

Binary file not shown.

BIN
sound/5.wav

Binary file not shown.

10
tmobile.html

@ -718,9 +718,8 @@ @@ -718,9 +718,8 @@
<p class="post-text no-ellipsis"></p>
<div class="post-context" style="display: none;">
<i class="post-retransmited-icon"></i>
<span style="font-size:60%;">Retransmitted by
<a class="post-retransmited-by open-profile-modal" href=""></a>
</span>
<span style="font-size:60%;">twisted again by</span>
<a style="font-size:60%;" class="post-retransmited-by open-profile-modal" href=""></a>
</div>
</div>
</li> <!-- post-template -->
@ -737,9 +736,8 @@ @@ -737,9 +736,8 @@
<p class="post-text no-ellipsis"></p>
<div class="post-context" style="display: none;">
<i class="post-retransmited-icon"></i>
<span style="font-size:60%;">Retransmitted by
<a class="post-retransmited-by open-profile-modal" href=""></a>
</span>
<span style="font-size:60%;">twisted again by</span>
<a style="font-size:60%;" class="post-retransmited-by open-profile-modal" href=""></a>
</div>
<!-- elementos de interação com o post que são exibidos no hover -->
<fieldset class="post-interactions ui-grid-a" data-role="fieldcontain">

Loading…
Cancel
Save