Merge branch 'chanlist' of https://github.com/CoryChaplin/KiwiIRC into development

[KiwiIRC.git] / client / src / index.html.tmpl

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index 43a09ff04c2b3cbcb97547735be954cd1d101ba2..09893fb3b88f0667202e8022291361498e0383a6 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -23,6 +23,7 @@
                 <div class="app_tools">\r
                     <ul class="main">\r
                         <li class="settings"><i class="icon-cogs" title="Settings"></i></li>\r
+                        <li class="startup"><i class="icon-home" title="Home"></i></li>\r
                         <li><a href="https://kiwiirc.com/" target="_blank"><img src="<%base_path%>/assets/img/ico.png" alt="KiwiIRC" title="KiwiIRC" /></a></li>\r
                     </ul>\r
                 </div>\r
@@ -45,7 +46,7 @@
             <div class="right_bar disabled">\r
                 <div class="channel_tools">\r
                     <i class="icon-info-sign channel_info" title="Channel Info"></i>\r
-                    <i class="icon-signout channel_part" ttle="Leave Channel"></i>\r
+                    <i class="icon-signout channel_part" title="Leave Channel"></i>\r
                 </div>\r
                 <div class="memberlists"></div>\r
             </div>\r
@@ -291,6 +292,12 @@
                                 <%= timestamps %>\r
                             </label>\r
                         </div>\r
+                        <div class="checkbox">\r
+                            <label>\r
+                                <input data-setting="use_24_hour_timestamps" type="checkbox">\r
+                                <%= timestamp_24 %>\r
+                            </label>\r
+                        </div>\r
                         <div class="checkbox">\r
                             <label>\r
                                 <input data-setting="mute_sounds" type="checkbox">\r
@@ -344,12 +351,12 @@
 \r
 \r
     <script type="text/html" id="tmpl_channel_list">\r
-        <div>\r
-            <table style="margin:1em 2em;">\r
+        <div class="applet_chanlist">\r
+            <table>\r
                 <thead style="font-weight: bold;">\r
                     <tr>\r
-                        <td><%= channel_name %></td>\r
-                        <td><%= users %></td>\r
+                        <td><a class="channel_name_title"><%= channel_name %></a></td>\r
+                        <td><a class="users_title"><%= users %></a></td>\r
                         <td style="padding-left: 2em;"><%= topic %></td>\r
                     </tr>\r
                 </thead>\r
@@ -376,7 +383,7 @@
     </script>\r
 \r
 \r
-<script src="<%base_path%>/assets/libs/jquery-1.10.2.min.js"></script>\r
+<script src="<%base_path%>/assets/libs/jquery-1.11.0.min.js"></script>\r
 <script>\r
 /* Script loader (https://github.com/ded/script.js) */\r
 (function(a,b,c){typeof c["module"]!="undefined"&&c.module.exports?c.module.exports=b():typeof c["define"]!="undefined"&&c["define"]=="function"&&c.define.amd?define(a,b):c[a]=b()})("$script",function(){function p(a,b){for(var c=0,d=a.length;c<d;++c)if(!b(a[c]))return j;return 1}function q(a,b){p(a,function(a){return!b(a)})}function r(a,b,i){function o(a){return a.call?a():d[a]}function t(){if(!--n){d[m]=1,l&&l();for(var a in f)p(a.split("|"),o)&&!q(f[a],o)&&(f[a]=[])}}a=a[k]?a:[a];var j=b&&b.call,l=j?b:i,m=j?a.join(""):b,n=a.length;return setTimeout(function(){q(a,function(a){if(h[a])return m&&(e[m]=1),h[a]==2&&t();h[a]=1,m&&(e[m]=1),s(!c.test(a)&&g?g+a+".js":a,t)})},0),r}function s(c,d){var e=a.createElement("script"),f=j;e.onload=e.onerror=e[o]=function(){if(e[m]&&!/^c|loade/.test(e[m])||f)return;e.onload=e[o]=null,f=1,h[c]=2,d()},e.async=1,e.src=c,b.insertBefore(e,b.firstChild)}var a=document,b=a.getElementsByTagName("head")[0],c=/^https?:\/\//,d={},e={},f={},g,h={},i="string",j=!1,k="push",l="DOMContentLoaded",m="readyState",n="addEventListener",o="onreadystatechange";return!a[m]&&a[n]&&(a[n](l,function t(){a.removeEventListener(l,t,j),a[m]="complete"},j),a[m]="loading"),r.get=s,r.order=function(a,b,c){(function d(e){e=a.shift(),a.length?r(e,d):r(e,b,c)})()},r.path=function(a){g=a},r.ready=function(a,b,c){a=a[k]?a:[a];var e=[];return!q(a,function(a){d[a]||e[k](a)})&&p(a,function(a){return d[a]})?b():!function(a){f[a]=f[a]||[],f[a][k](b),c&&c(e)}(a.join("|")),r},r},this)\r