twisterarmy
/
twister-html
mirror of https://github.com/twisterarmy/twister-html.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix network promoted message set up

master
Simon Grim 9 years ago
parent
22b3ba93ce
commit
0d2cfc5d83
7 changed files with 61 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      css/style.css
  2. 27
      js/twister_network.js
  3. 37
      network.html
  4. 13
      theme_calm/css/style.css
  5. 7
      theme_nin/css/style.css
  6. 7
      theme_nin/sass/_network.sass
  7. 1
      theme_nin/sass/style.sass

13
css/style.css
Unescape View File

@ -652,6 +652,7 @@ textarea.splited-post { @@ -652,6 +652,7 @@ textarea.splited-post {
background-color: #F2FFBA;
border: solid 1px #B4C669;
font-size: 11px;
line-height: normal;
margin: 4px 0;
padding: 4px;
word-wrap: break-word;
@ -1294,10 +1295,7 @@ ol.toptrends-list { @@ -1294,10 +1295,7 @@ ol.toptrends-list {
font-size: 13px;
list-style: circle;
}
.network.singleBlock button
{
padding: 3px 10px;
}
.network.singleBlock ul li > span
{
font-weight: bold;
@ -1335,10 +1333,9 @@ ol.toptrends-list { @@ -1335,10 +1333,9 @@ ol.toptrends-list {
{
border: 2px solid green;
}
.character-limit
{
float: right;
margin-right: 18px;
.network .post-area-extras {
margin-right: 20px;
}
/*************************************

27
js/twister_network.js
Unescape View File

@ -244,17 +244,20 @@ function getSpamMsg() { @@ -244,17 +244,20 @@ function getSpamMsg() {
}, {});
}
function setSpamMsg() {
var $postArea = $(".spam-msg");
var $localUsersList = $("select.local-usernames.spam-user");
var params = [$localUsersList.val(), $postArea.val()]
function setSpamMsg(event) {
event.stopPropagation();
event.preventDefault();
var btnUpdate = $(event.target);
$.MAL.disableButton(btnUpdate);
var params = [$("select.local-usernames.spam-user").val(),
btnUpdate.closest('.post-area-new').find('textarea.spam-msg').val().trim()];
twisterRpc("setspammsg", params,
function(args, ret) {
console.log("setspammsg updated");
}, {},
function(args, ret) {
console.log("setspammsg error");
}, {});
function(args, ret) {console.log("setspammsg updated");}, {},
function(args, ret) {console.log("setspammsg error");}, {}
);
}
function exitDaemon() {
@ -286,7 +289,9 @@ function interfaceNetworkHandlers() { @@ -286,7 +289,9 @@ function interfaceNetworkHandlers() {
$( ".add-dns").bind( "click", addDNSClick );
$( "select.genblock").change( setGenerate );
$( ".genproclimit").change( setGenerate );
$( ".update-spam-msg").bind( "click", setSpamMsg );
$('.network .post-area-new').off('click').on('click',
function (e) {e.stopPropagation(); $(this).addClass('open'); usePostSpliting = false;});
$('.post-submit.update-spam-msg').off('click').on('click', setSpamMsg);
$( ".terminate-daemon").bind( "click", exitDaemon )
}

37
network.html
Unescape View File

@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
</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>
@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
<button class="terminate-daemon">Exit</button>
</li>
</ul>
<h3> Detailed information </h3>
<ul>
<li class="connections">
@ -191,20 +191,25 @@ @@ -191,20 +191,25 @@
</li>
<li>
<label> Post to promote: </label>
<textarea class="spam-msg" placeholder="Type message here"></textarea>
<div class="post-area">
<form class="post-area-new open">
<textarea class="spam-msg" placeholder="Type message here"></textarea>
<div class="post-area-extras">
<span class="post-area-remaining">140</span>
<button class="undo-unicode disabled" disabled="true">undo</button>
<button class="post-submit update-spam-msg disabled" disabled="true">Update</button>
</div>
</form>
</div>
</li>
<li>
<label> Send post with username </label>
<select class="local-usernames spam-user">
<option value="nobody">nobody</option>
</select>
<div class="character-limit">
<span class="post-area-remaining">140</span>
<button class="update-spam-msg enabled">Update</button>
</div>
</li>
</ul>
<h3> Block generation status</h3>
<ul>
<li>
@ -218,6 +223,20 @@ @@ -218,6 +223,20 @@
</div>
<div id="templates" style="display:none;">
<div id="post-preview-template">
<div id="post-preview" class="post-text">
</div>
</div>
<!-- template for user links in message (open profile modal) -->
<a id="msg-user-link-template" class="open-profile-modal"></a>
<!-- template for user links in message (open profile modal) -->
<a id="external-page-link-template" rel="nofollow" target="_blank"></a>
<!-- template for user links in message (open profile modal) -->
<a id="hashtag-link-template" class="open-hashtag-modal"></a>
</div>
<audio id="player"></audio>
<audio id="playerSec"></audio>
</body>

13
theme_calm/css/style.css
Unescape View File

@ -781,6 +781,7 @@ textarea.splited-post { @@ -781,6 +781,7 @@ textarea.splited-post {
background-color: #F2FFBA;
border: solid 1px #B4C669;
font-size: 11px;
line-height: normal;
margin: 4px 0;
padding: 4px;
word-wrap: break-word;
@ -1659,10 +1660,7 @@ textarea.splited-post { @@ -1659,10 +1660,7 @@ textarea.splited-post {
font-size: 13px;
list-style: circle;
}
.network.singleBlock button
{
padding: 3px 10px;
}
.network.singleBlock ul li > span
{
font-weight: bold;
@ -1699,10 +1697,9 @@ textarea.splited-post { @@ -1699,10 +1697,9 @@ textarea.splited-post {
{
border: 2px solid #b2d67b;
}
.character-limit
{
float: right;
margin-right: 18px;
.network .post-area-extras {
margin-right: 20px;
}
/*************************************

7
theme_nin/css/style.css
Unescape View File

@ -1501,10 +1501,8 @@ span.connection-status.connected:before { @@ -1501,10 +1501,8 @@ span.connection-status.connected:before {
background: #B4C669;
}
/* line 61, ../sass/_network.sass */
.character-limit {
float: right;
margin-right: 18px;
.network .post-area-extras {
margin-right: 20px;
}
/* line 65, ../sass/_network.sass */
@ -2275,6 +2273,7 @@ textarea.splited-post { @@ -2275,6 +2273,7 @@ textarea.splited-post {
background-color: #FCFFF3;
border: solid 1px #ECEFE3;
font-size: 12px;
line-height: normal;
margin: 4px 0;
padding: 4px;
word-wrap: break-word;

7
theme_nin/sass/_network.sass
Unescape View File

@ -47,7 +47,7 @@ span.connection-status @@ -47,7 +47,7 @@ span.connection-status
line-height: 1em
font-weight: 500
font-size: 1em
&:before
&:before
content: ""
display: inline-block
height: .8em
@ -58,9 +58,8 @@ span.connection-status @@ -58,9 +58,8 @@ span.connection-status
&.connected:before
background: $main-color-color
.character-limit
float: right
margin-right: 18px
.network .post-area-extras
margin-right: 20px
.connections span, .known-peers, .dht-nodes, .blocks, .last-block-time, .mining-difficulty
color: #333

1
theme_nin/sass/style.sass
Unescape View File

@ -358,6 +358,7 @@ ul.userMenu-search-profiles @@ -358,6 +358,7 @@ ul.userMenu-search-profiles
background-color: #FCFFF3
border: solid 1px #ECEFE3
font-size: 12px
line-height: normal
margin: 4px 0
padding: 4px
word-wrap: break-word

Write Preview
Loading…
Cancel
Save