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

merge original and calm menus. new css classes have been defined to allow some entities to show/hide depending on the selected theme. 

use class="selectable_theme theme_XXX" to display only in theme XXX.
master
Miguel Freitas 11 years ago
parent
bcc51d9613
commit
dd900563c2
8 changed files with 36 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      following.html
  2. 19
      home.html
  3. 5
      js/interface_common.js
  4. 1
      js/interface_localization.js
  5. 6
      login.html
  6. 20
      network.html
  7. 6
      options.html
  8. 20
      profile-edit.html

15
following.html
Unescape View File

@ -40,13 +40,13 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home"><a href="home.html">Home</a></li> <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network"><a href="network.html">Network</a></li> <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
<li class="userMenu-config current"> <li class="userMenu-config current">
<a class="userMenu-config-dropdown" href="#"> <a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal"> <div class="config-menu dialog-modal">
<div class="mini-profile-info"> <div class="mini-profile-info selectable_theme theme_original">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div> <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> <a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span> <span class="mini-profile-view">View</span>
@ -56,20 +56,21 @@
<a class="dropdown-menu-item" href="following.html">Following users</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="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a> <a class="dropdown-menu-item" href="login.html">Change user</a>
<a class="direct-messages" href="#">Direct Messages</a> <a class="direct-messages selectable_theme theme_original" href="#">Direct Messages</a>
</div> </div>
</a> </a>
</li> </li>
<li class="userMenu-connections"> <li class="userMenu-connections">
<a href="#"> <a href="#">
<span class="messages-qtd" style="display:none;">12</span> <span class="messages-qtd" style="display:none;">0</span>
</a> </a>
</li> </li>
<li class="userMenu-messages"> <li class="userMenu-messages">
<a href="#"> <a href="#">
<span class="messages-qtd" style="display:none;">12</span> <span class="messages-qtd" style="display:none;">0</span>
</a> </a>
</li> </li>
<li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
<!-- BUSCA --> <!-- BUSCA -->
<li class="userMenu-search"> <li class="userMenu-search">

19
home.html
Unescape View File

@ -39,37 +39,38 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home current"><a href="#">Home</a></li> <li class="userMenu-home current"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network"><a href="network.html">Network</a></li> <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
<li class="userMenu-config"> <li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#"> <a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal"> <div class="config-menu dialog-modal">
<div class="mini-profile-info"> <div class="mini-profile-info selectable_theme theme_original">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div> <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> <a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span> <span class="mini-profile-view">View</span>
</div> </div>
<a class="dropdown-menu-item" href="options.html">Options</a> <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="profile-edit.html">Setup account</a>
<a class="dropdown-menu-item dropdown-menu-following" href="following.html">Following users</a> <a class="dropdown-menu-item dropdown-menu-following" 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" href="login.html">Change user</a>
<a class="dropdown-menu-item promoted-posts-only" href="#">Switch to Promoted posts</a> <a class="dropdown-menu-item promoted-posts-only selectable_theme theme_original" href="#">Switch to Promoted posts</a>
<a class="direct-messages dropdown-menu-item" href="#">Direct Messages</a> <a class="direct-messages dropdown-menu-item selectable_theme theme_original" href="#">Direct Messages</a>
</div> </div>
</a> </a>
</li> </li>
<li class="userMenu-connections"> <li class="userMenu-connections">
<a href="#"> <a href="#">
<span class="messages-qtd" style="display:none;">12</span> <span class="messages-qtd" style="display:none;">0</span>
</a> </a>
</li> </li>
<li class="userMenu-messages"> <li class="userMenu-messages">
<a href="#"> <a href="#">
<span class="messages-qtd" style="display:none;">12</span> <span class="messages-qtd" style="display:none;">0</span>
</a> </a>
</li> </li>
<li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
<!-- BUSCA --> <!-- BUSCA -->
<li class="userMenu-search"> <li class="userMenu-search">

5
js/interface_common.js
Unescape View File

@ -981,16 +981,15 @@ function changeStyle() {
{ {
style = 'css/style.css'; style = 'css/style.css';
profile = 'css/profile.css'; profile = 'css/profile.css';
menu = '.original_menu';
$(".userMenu-dhtindicator").hide();
}else }else
{ {
style = 'theme_calm/css/style.css'; style = 'theme_calm/css/style.css';
profile = 'theme_calm/css/profile.css'; profile = 'theme_calm/css/profile.css';
menu = '.calm_menu';
} }
$('#stylecss').attr('href', style); $('#stylecss').attr('href', style);
$('#profilecss').attr('href', profile); $('#profilecss').attr('href', profile);
$("<style type='text/css'> .selectable_theme{display:none!important;}\n" +
".theme_" + theme + "{display:block!important;}</style>").appendTo("head");
setTimeout(function(){$(menu).removeAttr('style')}, 0); setTimeout(function(){$(menu).removeAttr('style')}, 0);
} }

1
js/interface_localization.js
Unescape View File

@ -1829,7 +1829,6 @@ var fixedLabels = [
// navbar and home // navbar and home
"button", "button",
".userMenu > ul > li > a",
".postboard-news", ".postboard-news",
".post-area-new textarea", ".post-area-new textarea",
".refresh-users, .view-all-users", ".refresh-users, .view-all-users",

6
login.html
Unescape View File

@ -35,9 +35,9 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home"><a href="home.html">Home</a></li> <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network"><a href="network.html">Network</a></li> <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-profile current"><a href="login.html">Login</a></li> <li class="userMenu-profile current"><a class="label" href="login.html">Login</a></li>
<li class="userMenu-config"> <li class="userMenu-config">
</li> </li>

20
network.html
Unescape View File

@ -37,13 +37,13 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home"><a href="home.html">Home</a></li> <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network current"><a href="network.html">Network</a></li> <li class="userMenu-network current selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li> <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
<li class="userMenu-config"> <li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#"> <a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal"> <div class="config-menu dialog-modal">
<div class="mini-profile-info"> <div class="mini-profile-info selectable_theme theme_original">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div> <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> <a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span> <span class="mini-profile-view">View</span>
@ -53,20 +53,10 @@
<a class="dropdown-menu-item" href="following.html">Following users</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="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a> <a class="dropdown-menu-item" href="login.html">Change user</a>
<a class="direct-messages" href="#">Direct Messages</a>
</div> </div>
</a> </a>
</li> </li>
<li class="userMenu-connections"> <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
<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"> <li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search"/> <input type="text" class="userMenu-search-field" placeholder="search"/>
</li> </li>

6
options.html
Unescape View File

@ -30,8 +30,8 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home"><a href="home.html"></a></li> <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-options current"><a href="options.html">Options</a></li> <li class="userMenu-options current"><a class="label" href="options.html">Options</a></li>
<li class="userMenu-config"> <li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#"> <a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal"> <div class="config-menu dialog-modal">
@ -83,7 +83,7 @@
<option value="calm">Calm</option> <option value="calm">Calm</option>
</select> </select>
</form> </form>
<span class="calm_menu" style="display:none"> <span class="selectable_theme theme_calm">
For new features check <a href="https://github.com/iHedgehog/twister-calm">twister-calm repository</a>! For new features check <a href="https://github.com/iHedgehog/twister-calm">twister-calm repository</a>!
</span> </span>
</div> </div>

20
profile-edit.html
Unescape View File

@ -37,13 +37,13 @@
<!-- MENU SUPERIOR INIT --> <!-- MENU SUPERIOR INIT -->
<nav class="userMenu"> <nav class="userMenu">
<ul> <ul>
<li class="userMenu-home"><a href="home.html">Home</a></li> <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
<li class="userMenu-network"><a href="network.html">Network</a></li> <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
<li class="userMenu-profile current"><a href="profile-edit.html">Profile</a></li> <li class="userMenu-profile current selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
<li class="userMenu-config"> <li class="userMenu-config">
<a class="userMenu-config-dropdown" href="#"> <a class="userMenu-config-dropdown" href="#">
<div class="config-menu dialog-modal"> <div class="config-menu dialog-modal">
<div class="mini-profile-info"> <div class="mini-profile-info selectable_theme theme_original">
<div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div> <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> <a href="#" class="mini-profile-name">Fulano da Silva</a>
<span class="mini-profile-view">View</span> <span class="mini-profile-view">View</span>
@ -53,20 +53,10 @@
<a class="dropdown-menu-item" href="following.html">Following users</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="network.html">Network config</a>
<a class="dropdown-menu-item" href="login.html">Change user</a> <a class="dropdown-menu-item" href="login.html">Change user</a>
<a class="direct-messages" href="#">Direct Messages</a>
</div> </div>
</a> </a>
</li> </li>
<li class="userMenu-connections"> <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
<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"> <li class="userMenu-search">
<input type="text" class="userMenu-search-field" placeholder="search"> <input type="text" class="userMenu-search-field" placeholder="search">
</li> </li>

Write Preview
Loading…
Cancel
Save