Merge pull request #30 from twisterarmy/nin-night

add Nin Flat Night theme

home.html

@@ -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">
@@ -99,7 +99,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 +159,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>
@@ -742,10 +742,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>

js/interface_common.js

@@ -2747,6 +2747,11 @@ function changeStyle() {
         // we use .ajax because .getScript requires 'unsafe-inline' CSP rule for now, see https://github.com/jquery/jquery/issues/3969
         $.ajax({dataType: 'text', url: 'theme_nin/js/theme_option.js'})
             .done(function(res) {eval(res);});
+    } else if (theme === 'nin_night') {
+        style = 'theme_nin_night/css/style.css';
+        profile = 'theme_nin_night/css/profile.css';
+        $.ajax({dataType: 'text', url: 'theme_nin_night/js/theme_option.js'})
+            .done(function(res) {eval(res);});
     } else if (theme === 'nin_original') {
         theme = 'nin'; // related to native theme in class definitions, so easiest way to integrate original version
         style = 'theme_nin_original/css/style.css';

js/twister_io.js

@@ -432,6 +432,9 @@ function getAvatar(peerAlias, img) {
           case 'nin':
             avatar = 'theme_nin/img/tornado_avatar.png';
           break;
+          case 'nin_night':
+            avatar = 'theme_nin_night/img/tornado_avatar.png';
+          break;
           case 'nin_original':
             avatar = 'theme_nin_original/img/tornado_avatar.png';
           break;

network.html

@@ -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">
@@ -58,7 +58,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>

options.html

@@ -100,6 +100,7 @@
                   <option value="original">Original</option>
                   <option value="calm">Calm</option>
                   <option value="nin">Nin Flat</option>
+                  <option value="nin_night">Nin Flat Night</option>
                   <option value="nin_original">Nin Original</option>
                 </select>
               </form>

theme_nin_night/css/fonts/OpenSans-Bold.ttf

@@ -0,0 +1 @@
+../../../css/OpenSans-Bold.ttf

theme_nin_night/css/fonts/OpenSans-Regular.ttf

@@ -0,0 +1 @@
+../../../css/OpenSans-Regular.ttf

theme_nin_night/css/fonts/Symbola.ttf

@@ -0,0 +1 @@
+../../../css/Symbola.ttf

theme_nin_night/css/fonts/fontello/fontello.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<defs>
+<font id="fontello" horiz-adv-x="1000" >
+<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="search" unicode="&#xe800;" d="m0 386q0 80 31 152t84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51 0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 83-84 126-31 153z m143 0q0-103 73-177t177-73 176 73 74 177-74 176-176 74-177-74-73-176z" horiz-adv-x="928.6" />
+<glyph glyph-name="mail" unicode="&#xe801;" d="m467 366l-449 210 0 109 893 0 0-109z m0-123l444 210 0-437-893 0 0 438z" horiz-adv-x="928" />
+<glyph glyph-name="heart" unicode="&#xe802;" d="m0 517q0 123 71 192t196 70q34 0 70-12t67-33 54-38 42-38q20 20 42 38t54 38 67 33 70 12q125 0 196-70t71-192q0-123-128-251l-347-335q-10-10-25-10t-25 10l-348 336q-5 5-15 15t-31 36-38 55-30 67-13 77z" horiz-adv-x="1000" />
+<glyph glyph-name="star" unicode="&#xe803;" d="m0 489q0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26 0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27z" horiz-adv-x="928.6" />
+<glyph glyph-name="user" unicode="&#xe804;" d="m0 66q0 30 2 58t8 61 15 60 24 55 34 45 48 30 62 11q5 0 24-12t41-27 60-27 75-12 74 12 61 27 41 27 24 12q34 0 62-11t48-30 34-45 24-55 15-60 8-61 2-58q0-67-41-106t-108-39h-488q-67 0-108 39t-41 106z m179 498q0 89 62 152t152 63 151-63 63-152-63-151-151-63-152 63-62 151z" horiz-adv-x="785.7" />
+<glyph glyph-name="camera" unicode="&#xe805;" d="m0 64v500q0 59 42 101t101 42h125l28 76q11 27 39 47t58 20h286q29 0 57-20t39-47l29-76h125q59 0 101-42t41-101v-500q0-59-41-101t-101-42h-786q-59 0-101 42t-42 101z m286 250q0-103 73-176t177-74 176 74 74 176-74 177-176 73-177-73-73-177z m89 0q0 67 47 114t114 47 113-47 47-114-47-113-113-47-114 47-47 113z" horiz-adv-x="1071.4" />
+<glyph glyph-name="ok" unicode="&#xe806;" d="m68 332q0 22 15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q15-16 15-38t-15-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38z" horiz-adv-x="1000" />
+<glyph glyph-name="cancel" unicode="&#xe807;" d="m61 112q0 23 16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38t-15-38l-76-76q-16-15-38-15t-38 15l-164 164-164-164q-16-15-38-15t-38 15l-76 76q-16 16-16 38z" horiz-adv-x="785.7" />
+<glyph glyph-name="plus" unicode="&#xe808;" d="m0 332v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q22 0 38-16t16-38v-107q0-22-16-38t-38-16h-232v-232q0-22-16-38t-38-15h-107q-22 0-38 15t-15 38v232h-232q-23 0-38 16t-16 38z" horiz-adv-x="785.7" />
+<glyph glyph-name="minus" unicode="&#xe809;" d="m0 332v107q0 23 16 38t38 16h678q22 0 38-16t16-38v-107q0-22-16-38t-38-15h-678q-23 0-38 15t-16 38z" horiz-adv-x="785.7" />
+<glyph glyph-name="down" unicode="&#xe80a;" d="m50 425q0 14 11 25l92 92q11 11 26 11t25-11l296-296 296 296q11 11 25 11t26-11l92-92q11-11 11-25t-11-26l-414-413q-10-11-25-11t-25 11l-414 413q-11 11-11 26z" horiz-adv-x="1000" />
+<glyph glyph-name="lock" unicode="&#xe80b;" d="m0 46v322q0 22 16 38t38 15h17v108q0 102 74 176t176 74 177-74 73-176v-108h18q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37z m179 375h285v108q0 59-42 101t-101 41-101-41-41-101v-108z" horiz-adv-x="642.9" />
+<glyph glyph-name="quote" unicode="&#xe80c;" d="m0 100v393q0 58 23 111t61 91 91 61 111 23h35q15 0 26-11t10-25v-72q0-14-10-25t-26-10h-35q-59 0-101-42t-42-101v-18q0-22 16-38t37-16h125q45 0 76-31t32-76v-214q0-45-32-76t-76-31h-214q-44 0-76 31t-31 76z m500 0v393q0 58 23 111t61 91 91 61 111 23h35q15 0 26-11t10-25v-72q0-14-10-25t-26-10h-35q-59 0-101-42t-42-101v-18q0-22 15-38t38-16h125q45 0 76-31t32-76v-214q0-45-32-76t-76-31h-214q-44 0-76 31t-31 76z" horiz-adv-x="928.6" />
+<glyph glyph-name="comment" unicode="&#xe80d;" d="m0 350q0 73 40 139t106 114 160 76 194 28q136 0 251-48t182-130 67-179-67-179-182-130-251-48q-39 0-81 4-110-97-257-135-27-7-63-12-10-1-17 5t-10 16v1q-2 2 0 7t1 5 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157z" horiz-adv-x="1000" />
+<glyph glyph-name="chat" unicode="&#xe80e;" d="m0 421q0 78 53 144t143 104 197 38 197-38 143-104 53-144-53-143-143-104-197-38q-48 0-98 9-70-50-155-72-21-5-48-9h-2q-6 0-12 5t-6 11q-1 2-1 4t1 4 1 3l1 3t2 3 2 3 3 2 2 3q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125z m344-354q32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74z" horiz-adv-x="1000" />
+<glyph glyph-name="left" unicode="&#xe80f;" d="m86 386q0 14 11 25l414 414q10 10 25 10t25-10l92-93q11-10 11-25t-11-25l-296-296 296-297q11-10 11-25t-11-25l-92-93q-11-10-25-10t-25 10l-414 415q-11 10-11 25z" horiz-adv-x="714.3" />
+<glyph glyph-name="right" unicode="&#xe810;" d="m50 64q0 15 11 25l296 297-296 296q-11 11-11 25t11 25l92 93q11 10 26 10t25-10l414-414q10-11 10-25t-10-25l-414-414q-11-11-25-11t-26 11l-92 92q-11 11-11 25z" horiz-adv-x="714.3" />
+<glyph glyph-name="up" unicode="&#xe811;" d="m50 133q0 14 11 25l414 414q11 10 25 10t25-10l414-414q11-11 11-25t-11-26l-92-92q-11-10-26-10t-25 10l-296 297-296-297q-11-10-25-10t-26 10l-92 92q-11 11-11 26z" horiz-adv-x="1000" />
+<glyph glyph-name="cog" unicode="&#xe812;" d="m0 299v103q0 6 4 11t9 6l86 14q7 19 18 42-19 27-50 64-4 6-4 11 0 7 4 12 12 16 46 49t44 33q6 0 12-4l64-50q19 10 43 18 6 60 13 86 3 13 16 13h104q6 0 11-4t6-10l13-85q19-6 41-17l66 49q5 4 11 4 7 0 12-4 81-75 81-90 0-5-4-10-7-9-24-30t-25-34q13-27 19-46l85-12q5-2 9-6t4-11v-103q0-6-4-11t-9-6l-86-14q-6-19-18-42 19-27 50-64 4-6 4-11 0-7-4-11-13-17-46-50t-44-33q-6 0-11 4l-64 50q-21-11-43-17-6-60-13-87-4-13-17-13h-104q-6 0-11 4t-5 10l-13 85q-19 6-42 18l-66-50q-4-4-11-4-6 0-12 4-80 75-80 90 0 5 4 10 5 8 23 30t26 34q-13 24-20 46l-85 13q-5 1-9 5t-4 11z m214 51q0-59 42-101t101-42 101 42 42 101-42 101-101 42-101-42-42-101z m429-325v78q0 9 83 18 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 1 17 1t17-1q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-9 83-18v-78q0-9-83-17-6-15-16-29 28-63 28-77 0-2-2-4-68-40-69-40-5 0-26 27t-29 37q-11-1-17-1t-17 1q-7-11-29-37t-25-27q-1 0-69 40-3 2-3 4 0 14 29 77-10 14-17 29-83 8-83 17z m0 572v78q0 9 83 17 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 2 17 2t17-2q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-8 83-17v-78q0-9-83-18-6-15-16-29 28-63 28-77 0-2-2-4-68-39-69-39-5 0-26 26t-29 38q-11-1-17-1t-17 1q-7-12-29-38t-25-26q-1 0-69 39-3 2-3 4 0 14 29 77-10 14-17 29-83 9-83 18z m143-533q0-29 21-50t50-21 51 21 21 50q0 29-22 51t-50 21-50-21-21-51z m0 572q0-30 21-51t50-21 51 21 21 51q0 29-22 50t-50 21-50-21-21-50z" horiz-adv-x="1071.4" />
+<glyph glyph-name="doc" unicode="&#xe813;" d="m0-96v892q0 23 16 38t38 16h446v-304q0-22 16-38t38-15h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38z m571 660v264q13-8 21-16l227-228q8-7 16-20h-264z" horiz-adv-x="857.1" />
+<glyph glyph-name="arrows" unicode="&#xe814;" d="m0-7v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-37 90-57t105-20q74 0 139 37t104 99q6 10 29 66 5 13 17 13h107q8 0 13-6t5-12q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25z m10 446v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12z" horiz-adv-x="857.1" />
+<glyph glyph-name="twistagain" unicode="&#xe815;" d="m0 386q0 13 8 23l179 214q11 12 27 12t28-12l178-214q9-10 9-23 0-15-11-25t-25-11h-107v-214h321q9 0 14-6l89-108q4-6 4-11 0-8-5-13t-13-5h-535q-5 0-8 1t-5 4-3 4-2 7 0 6v335h-107q-15 0-25 11t-11 25z m357 232q0 7 5 12t13 6h536q4 0 7-1t5-4 3-5 2-6 1-7v-334h107q14 0 25-11t10-25q0-14-8-23l-179-214q-11-13-27-13t-27 13l-179 214q-8 9-8 23 0 14 10 25t26 11h107v214h-322q-9 0-14 7l-89 107q-4 5-4 11z" horiz-adv-x="1071.4" />
+<glyph glyph-name="bell" unicode="&#xe816;" d="m632 426q16-34 40-52t45-22 44-23 35-55q22-62-74-161t-252-157q-164-58-297-45t-155 75q-20 54 12 111t18 111q-56 192-47 300t113 192q26 22 29 51t29 39q24 8 46-12t56-18q132 2 198-66t160-268z m-186-404q88 32 159 85t100 91 25 50q-8 22-49 33t-124 1-187-48q-102-38-173-87t-94-84-17-53q4-12 50-22t134-4 176 38z m-62 174q8 2 21 7t17 7l2-2q14-40-17-83t-89-63q-96-36-152 14 78 68 218 120z" horiz-adv-x="800" />
+</font>
+</defs>
+</svg>

theme_nin_night/css/jquery.mobile-1.3.2.min.css

@@ -0,0 +1 @@
+../../css/jquery.mobile-1.3.2.min.css

theme_nin_night/js/theme_option.js

@@ -0,0 +1,59 @@
+$(function () {
+    $('.modal-close').html('');
+    $('.modal-back').html('');
+    $('.twister-user-remove').html('');
+    $('.profile-card-main').attr('style', '');
+    $('img[src$="img/tornado_avatar.png"]').attr("src","theme_nin_night/img/tornado_avatar.png");
+    $('.mini-profile-actions span').html('');
+
+    // indirect eval call in hope to execute code globally
+    (1, eval)(postToElem.toString().replace(/postContext.append\(twister\.tmpl\.postRtBy/,
+        'postContext.prependTo(postContext.parent()).append(twister.tmpl.postRtBy'));
+
+    $('.userMenu-home.current a').on('click', function () {
+        $('html, body').animate({scrollTop:0},300);
+        return false
+    });
+
+    $('.promoted-posts-only').on('click', function () {
+    // modify the way promoted posts are shown
+        //active promoted posts tab
+        $(this).children('.promoted-posts').addClass(promotedPostsOnly ? "active" : "disabled");
+        $(this).children('.normal-posts').addClass(promotedPostsOnly ? "disabled" : "active");
+        $('#postboard-top').removeClass(promotedPostsOnly ? "show" : "hide");
+        //active normal posts
+        $(this).children('.promoted-posts').removeClass(promotedPostsOnly ? "disabled" : "active");
+        $(this).children('.normal-posts').removeClass(promotedPostsOnly ? "active" : "disabled");
+        $('#postboard-top').addClass(promotedPostsOnly ? "hide" : "show");
+    });
+
+    $(window).on('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')));
+
+
+    $('#search-profile-template .follow')
+        .html('')
+        .attr('title', polyglot.t('Follow'))
+        .on('eventToggleFollow', function() {
+            $(this).text('').attr('title', polyglot.t('Follow'));
+        })
+        .on('eventToggleUnfollow', function() {
+            $(this).text('').attr('title', polyglot.t('Unfollow'));
+        })
+    ;
+
+    if (/\/options.html$/i.test(document.location))
+        localizeLabels();
+});
+
+function localizeLabels() {
+    $('label.tabs').each(function (i, elem) {
+        var elem = $(elem);
+        elem.text(polyglot.t(elem.text()));
+    });
+}