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

rollback twisterarmy compatibility

pull/36/head
d47081 2 years ago
parent
d41aa91b42
commit
d10d66a2db
4 changed files with 56 additions and 37 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. 63
      README.md
  2. 21
      home.html
  3. 2
      js/mobile_abstract.js
  4. 7
      network.html

63
README.md
Unescape View File

@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
twister-html
============
HTML interface for **[twister](http://twister.net.co)** (see git repo [here](https://github.com/miguelfreitas/twister-core)). It is a FOSS which is being under heavy construction.
HTML interface for twister core.
To use it, clone this repo under `~/.twister/html` like this:
See git repo [here](https://github.com/twisterarmy/twister-core).
Official (currently unmaintained) [version](https://github.com/miguelfreitas/twister-core)
git clone https://github.com/miguelfreitas/twister-html.git ~/.twister/html
Stable releses available on this [page](https://github.com/twisterarmy/twister-html/releases).
To use development version, clone this repo under `~/.twister/html` like this:
git clone https://github.com/twisterarmy/twister-html.git ~/.twister/html
If you're on **Mac OS X** — clone to `${HOME}/Library/Application\ Support/Twister/html` instead of `~/.twister/html`
Be on the bleeding edge
-----------------------
Switch the edition
-----------------
TA Edition includes official Blaster updates and alternative features. To switch it, use followig commands:
All nightly improvements and following fixes of these improvements are tested in [blaster](https://github.com/miguelfreitas/twister-html/tree/blaster) branch.
To be sure you are at the forefront, in stage of lack of testing and consensus:
git pull && git checkout twisterarmy
git pull && git checkout blaster
If you want to switch blaster branch:
If you want to switch back to stable branch:
git checkout blaster
If the master branch:
git checkout master
Follow `@letstwist` in twister to be aware of recent changes. In case of getting of twister-html related buzz from it:
Get updates:
git pull
@ -31,7 +39,7 @@ Contribute @@ -31,7 +39,7 @@ Contribute
Feel free to fork and send pull requests!
To make it easier for us to accept your patches, please follow the conventional GitHub workflow
and keep in mind that your pull requests should have **blaster** branch as both the origin and target.
and keep in mind that your pull requests should have **twisterarmy** branch as both the origin and target.
1. After forking, clone your repo:
@ -39,38 +47,42 @@ and keep in mind that your pull requests should have **blaster** branch as both @@ -39,38 +47,42 @@ and keep in mind that your pull requests should have **blaster** branch as both
git clone git@github.com:YOURNICKNAME/twister-html.git ~/.twister/html
cd ~/.twister/html
2. Switch to 'blaster' branch:
2. Switch to 'twisterarmy' branch:
git checkout blaster
git checkout twisterarmy
3. CREATE A NEW BRANCH, specific to the fix you're implementing:
3. CREATE A NEW BRANCH, specific to the branch prefix and fix you're implementing:
git checkout -b my-awesome-fix
git checkout -b twisterarmy_my_awesome_fix
4. Make your changes.
5. Commit and push:
git commit -m "fix of #12345: bad foobarizer" && git push
git commit -m "fix of #12345: bad foobarizer" && git push --set-upstream origin twisterarmy_my_awesome_fix
6. Now open a pull request from branch 'YOURNICKNAME:my-awesome-fix' to 'miguelfreitas:blaster' on GitHub.
6. Now open a pull request from branch 'YOURNICKNAME:twisterarmy_my_awesome_fix' to 'twisterarmy:twisterarmy' on GitHub.
7. Once the request is accepted, switch back to 'blaster' and track changes in upstream repo:
7. Once the request is accepted, switch back to 'twisterarmy' and track changes in upstream repo:
git remote add upstream https://github.com/miguelfreitas/twister-html.git # this is one-off setup
git fetch upstream && git checkout blaster
git merge upstream/blaster # you should get a fast-forward message here
git remote add upstream https://github.com/twisterarmy/twister-html.git # this is one-off setup
git fetch upstream && git checkout twisterarmy
git merge upstream/twisterarmy # you should get a fast-forward message here
git push
8. Alternatively, make your contribution into the official project:
https://github.com/miguelfreitas
Translations
------------
If you want to add your own translation, edit `interface_localization.js` like this:
1. Fork the repo and create a new branch from 'blaster' one:
1. Fork the repo and create a new branch from 'twisterarmy' one:
git clone git@github.com:YOURNICKNAME/twister-html.git ~/.twister/html
cd ~/.twister/html && git checkout blaster
cd ~/.twister/html && git checkout twisterarmy
git checkout -b Klingon-translation
2. Add your language to the list of available choices. You should use your ISO code here,
@ -100,6 +112,7 @@ For multi-region languages, if you want to catch them all, use only the first ha @@ -100,6 +112,7 @@ For multi-region languages, if you want to catch them all, use only the first ha
git commit -m 'Klingon translation'
git push origin Klingon-translation
6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'miguelfreitas:blaster' on GitHub.
6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'twisterarmy:twisterarmy' or 'twisterarmy:twisterarmy' on GitHub.
For any help ping `@tasty` in twister.
[Community support](https://github.com/twisterarmy/twister-html/issues)
[Official support](https://github.com/miguelfreitas/twister-core/issues)

21
home.html
Unescape View File

@ -37,9 +37,9 @@ @@ -37,9 +37,9 @@
<ul>
<li class="userMenu-home current"><a href="home.html">
<span class="selectable_theme theme_original label">Home</span>
<span class="selectable_theme theme_nin menu-news"></span>
<span class="selectable_theme theme_nin theme_nin_night menu-news"></span>
</a></li>
<li class="userMenu-network selectable_theme theme_original theme_nin"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-network selectable_theme theme_original theme_nin theme_nin_night"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-config">
<a class="userMenu-config-dropdown">
<div class="config-menu dialog-modal">
@ -58,6 +58,9 @@ @@ -58,6 +58,9 @@
<a class="dropdown-menu-item promoted-posts-only selectable_theme theme_original theme_calm" href="#">Switch to Promoted posts</a>
<a class="dropdown-menu-item direct-messages selectable_theme theme_original theme_calm" href="#">Direct Messages</a>
<a class="dropdown-menu-item groupmessages selectable_theme theme_original theme_calm" href="#">Group Messages</a>
<a class="dropdown-menu-item" href="https://github.com/twisterarmy/twister-html/issues" target="_blank">Feedback</a>
<a class="dropdown-menu-item" href="https://twisterarmy.github.io" target="_blank">Project Website</a>
<a class="dropdown-menu-item" href="https://twisterarmy.github.io/donate" target="_blank">Donate</a>
</div>
</a>
</li>
@ -99,7 +102,7 @@ @@ -99,7 +102,7 @@
<!-- LADO ESQUERDO DE MÓDULOS INIT -->
<div class="dashboard left">
<!-- THEME NIN added sub-menu (mentions, messages and edit profile) -->
<ul class="mini-profile-indicators selectable_theme theme_nin">
<ul class="mini-profile-indicators selectable_theme theme_nin theme_nin_night">
<li class="userMenu-connections">
<a href="#" title="Mentions"><span class="messages-qtd" style="display:none;">0</span><span>Mentions</span></a>
</li>
@ -159,12 +162,12 @@ @@ -159,12 +162,12 @@
<button class="postboard-news selectable_theme theme_original theme_calm" style="display: none;"></button>
</h2>
<!-- Tabs to switch between promoted post and normal posts-->
<ul class="promoted-posts-only promoted selectable_theme theme_nin">
<ul class="promoted-posts-only promoted selectable_theme theme_nin theme_nin_night">
<li class="normal-posts active"><span>Normal posts</span></li>
<li class="promoted-posts disabled"><span>Promoted posts</span></li>
</ul>
<!-- Post area on top of postboard -->
<div id="postboard-top" class=" selectable_theme theme_nin">
<div id="postboard-top" class=" selectable_theme theme_nin theme_nin_night">
<div class="post-area">
<form class="post-area-new">
<textarea placeholder="New Post..."></textarea>
@ -315,7 +318,7 @@ @@ -315,7 +318,7 @@
<span class="followed-by"></span>
</a>
</div>
<a class="twister-user-remove">&times;</a>
<a class="twister-user-remove"><span>&times;</span></a>
<div class="latest-activity" data-screen-name="" data-id="" data-time="0">
<span class="label">Last activity</span>
<span class="time"></span>
@ -449,7 +452,7 @@ @@ -449,7 +452,7 @@
<div id="template-inline-warn">
<div class="inline-warn">
<div class="close">&times;</div>
<div class="close"><span>&times;</span></div>
<div class="text"></div>
<div class="options">
<div><input type="checkbox" class="never-again" /><span>don't show it again</span></div>
@ -742,10 +745,10 @@ @@ -742,10 +745,10 @@
<div class="profile-bio"></div>
<div id="msngrswr">
<div id="toxbtnwr" class="profile-extra-contact">
<a class="profile-tox"><span class="selectable_theme theme_nin">TOX</span></a><a class="tox-ctc"></a>
<a class="profile-tox"><span class="selectable_theme theme_nin theme_nin_night">TOX</span></a><a class="tox-ctc"></a>
</div>
<div id="bmbtnwr" class="profile-extra-contact">
<a class="profile-bitmessage"><span class="selectable_theme theme_nin">BitMessage</span></a><a class="bitmessage-ctc"></a>
<a class="profile-bitmessage"><span class="selectable_theme theme_nin theme_nin_night">BitMessage</span></a><a class="bitmessage-ctc"></a>
</div>
</div>
</div>

2
js/mobile_abstract.js
Unescape View File

@ -662,7 +662,7 @@ function checkUpdatesClient(alertIfNoUpdates) { @@ -662,7 +662,7 @@ function checkUpdatesClient(alertIfNoUpdates) {
}
var repo = 'twister-html'; // TODO source repo selection in options
var repoOwner = 'miguelfreitas';
var repoOwner = 'twisterarmy';
// TODO notification if local branch was changed ('r u wanna reload the page?')
/*if (!twister.var.updatesCheckClient.formerBranch || !twister.var.updatesCheckClient.formerCommit) {

7
network.html
Unescape View File

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<nav class="userMenu">
<ul>
<li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network current selectable_theme theme_original theme_nin"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-network current selectable_theme theme_original theme_nin theme_nin_night"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-config">
<a class="userMenu-config-dropdown">
<div class="config-menu dialog-modal">
@ -45,6 +45,9 @@ @@ -45,6 +45,9 @@
<a class="dropdown-menu-item" href="options.html">Options</a>
<a class="dropdown-menu-item" href="/#/account">Setup account</a>
<a class="dropdown-menu-item updates-check-client">Check for client's updates</a>
<a class="dropdown-menu-item" href="https://github.com/twisterarmy/twister-html/issues" target="_blank">Feedback</a>
<a class="dropdown-menu-item" href="https://twisterarmy.github.io" target="_blank">Project Website</a>
<a class="dropdown-menu-item" href="https://twisterarmy.github.io/donate" target="_blank">Donate</a>
</div>
</a>
</li>
@ -58,7 +61,7 @@ @@ -58,7 +61,7 @@
<div class="network singleBlock">
<h2 class="selectable_theme theme_original theme_calm"> Network status </h2>
<div class="module">
<h2 class="selectable_theme theme_nin"> Network status </h2>
<h2 class="selectable_theme theme_nin theme_nin_night"> Network status </h2>
<h3> General information</h3>
<ul>
<li>

Write Preview
Loading…
Cancel
Save