X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=client%2Fassets%2Fdev%2Findex.html.tmpl;h=6afde0dae9edf8d0dd951f985327b3360a21757f;hb=5e84a85a544dc971312d9937f1cd3c262cdc6051;hp=baa65277707aed22e93637aeb702270b42825892;hpb=bac3c32ee9b2cc28d457e1a6dcd71cb395be77f1;p=KiwiIRC.git

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index baa6527..6afde0d 100644
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -2,12 +2,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 <base target="_blank">
 
 <title> KiwiIRC </title>
 
 <link rel="stylesheet" type="text/css" href="<%base_path%>/assets/css/style.css" />
-<link rel="stylesheet" type="text/css" href="<%base_path%>/assets/css/font-awesome.css" />
+<link rel="stylesheet" type="text/css" href="<%base_path%>/assets/css/font-awesome.min.css" />
 <!--[if IE 7]>
 <link rel="stylesheet" type="text/css" href="/kiwi/assets/css/font-awesome-ie7.css" />
 <![endif]-->
@@ -18,14 +19,11 @@
             <div class="app_tools">
                 <ul class="main">
                     <li class="settings"><i class="icon-cogs" title="Settings"></i></li>
-                    <li><a href="http://kiwiirc.com/" target="_blank"><img src="<%base_path%>/assets/img/ico.png" alt="KiwiIRC" title="KiwiIRC" /></a></li>
+                    <li><a href="https://kiwiirc.com/" target="_blank"><img src="<%base_path%>/assets/img/ico.png" alt="KiwiIRC" title="KiwiIRC" /></a></li>
                 </ul>
             </div>
 
-            <div id="tabs">
-                <ul class="panellist channels"></ul>
-                <ul class="panellist applets"></ul>
-            </div>
+            <div id="tabs"></div>
 
             <div id="topic">
                 <div contenteditable="true"></div>
@@ -40,12 +38,13 @@
             <div class="panel_container container1"></div>
         </div>
 
-        <div id="memberlists"></div>
+        <div id="memberlists" class="disabled"></div>
 
         <div id="controlbox">
             <div class="input">
                 <span class="nick"> </span>
                 <div class="input_wrap"><textarea class="inp"></textarea></div>
+                <div class="input_tools"></div>
             </div>
         </div>
     </div>
@@ -57,11 +56,16 @@
     
     <script type="text/html" id="tmpl_userbox">
         <div class="userbox">
+            <a class="if_op op"><i class="icon-star"></i>Op</a>
+            <a class="if_op deop"><i class="icon-star-empty"></i>De-op</a>
+            <a class="if_op voice"><i class="icon-volume-up"></i>Voice</a>
+            <a class="if_op devoice"><i class="icon-volume-off"></i>De-voice</a>
+            <a class="if_op kick"><i class="icon-remove"></i>Kick</a>
+            <a class="if_op ban"><i class="icon-ban-circle"></i>Ban</a>
+
             <a class="query"><i class="icon-comment"></i>Message</a>
             <a class="info"><i class="icon-info-sign"></i>Info</a>
             <a class="slap"><i class="icon-user-md"></i>Slap!</a>
-
-            <div class="divider-horizontal"></div>
         </div>
     </script>
     
@@ -71,10 +75,24 @@
         </form>
     </script>
 
+    <script type="text/html" id="tmpl_new_connection_info">
+        <div style="margin:1em 20px;">
+            <img src="https://kiwiirc.com/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" style="display:block; margin:0 auto;"/> <br />
+            <p style="font-style:italic;">A <strong>hand-crafted IRC client</strong> that you can enjoy. Designed to be used <strong>easily</strong> and <strong>freely</strong>.</p>
+
+            <p style="font-size:0.9em;margin-top:2em;">Peek at the <a href="https://www.kiwiirc.com/">Kiwi IRC homepage</a> for more information or to find out how to embed it on your own website. Looking for source code? Try the <a href="http://github.com/prawnsalad/KiwiIRC/">GitHub</a> page. This network of people may not be associated with Kiwi IRC itself.</p>
+        </div>
+    </script>
+
     <script type="text/html" id="tmpl_server_select">
         <div class="server_select">
 
-            <div class="server_details" style="position:relative;float:left;width:320px;padding-right:3em;margin-top:50px;">
+            <div class="side_panel" style="position:absolute;top:0px;left:320px;">
+                <div class="content" style="position:relative;width:300px;">
+                </div>
+            </div>
+
+            <div class="server_details" style="position:relative;width:320px;">
                 <div class="status">Think of a nickname..</div>
 
                 <form>
@@ -98,7 +116,18 @@
 
                             <tr class="channel">
                                 <td><label for="server_select_channel">Channel</label></td>
-                                <td><input type="text" class="channel" id="server_select_channel"><input type="hidden" class="channel_key"></td>
+                                <td><input type="text" class="channel" id="server_select_channel"></td>
+                            </tr>
+
+                            <tr class="have_key">
+                                <td colspan="2">
+                                    <label for="server_select_show_channel_key">Channel requires a key</label> <input type="checkbox" id="server_select_show_channel_key" style="width:auto;" />
+                                </td>
+                            </tr>
+
+                            <tr class="key">
+                                <td><label for="server_select_channel_key">Key</label></td>
+                                <td><input type="text" class="channel_key" id="server_select_channel_key"></td>
                             </tr>
 
                             <tr class="start">
@@ -130,18 +159,9 @@
                     </div>
                 </form>
 
-                <div class="divider-verticle"></div>
-            </div>
-
-            <div class="about_kiwi" style="position:relative;float:left;width:320px;margin-left:3em;color:#555555;">
-                <a class="kiwi_logo" href="http://www.kiwiirc.com/" target="_blank">
-                    <img src="<%base_path%>/assets/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /> <br />
-                    <h1>Powered by Kiwi IRC</h1>
+                <a class="kiwi_logo" href="https://kiwiirc.com/" target="_blank">
+                    <h1><span>Powered by Kiwi IRC</span> <img src="/kiwi/assets/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" /></h1>
                 </a>
-
-                <p style="font-style:italic;">A <strong>hand-crafted IRC client</strong> that you can enjoy. Designed to be used <strong>easily</strong> and <strong>freely</strong>.</p>
-
-                <p style="font-size:0.9em;margin-top:2em;">Peek at the <a href="http://www.kiwiirc.com/">Kiwi IRC homepage</a> for more information or to find out how to embed it on your own website. Looking for source code? Try the <a href="http://github.com/prawnsalad/KiwiIRC/">GitHub</a> page. This network of people may not be associated with Kiwi IRC itself.</p>
             </div>
         </div>
     </script>
@@ -150,27 +170,51 @@
         <div class="settings">
             â<table>
                 <tr>
-                    <td>Theme</td>
-                    <td>
+                    <td class="label">Theme</td>
+                    <td class="setting">
                         <select class="setting-theme">
                             <option value="relaxed">Relaxed</option>
                             <option value="mini">Mini</option>
                             <option value="cli">CLI</option>
+                            <option value="basic">Basic</option>
                         </select>
                     </td>
                 </tr>
                 <tr>
-                    <td>Scrollback</td>
-                    <td><input type="text" class="setting-scrollback" value="150" /></td>
+                    <td class="label">Channel list</td>
+                    <td class="setting">
+                        <select class="setting-channel_list_style">
+                            <option value="list">List</option>
+                            <option value="tabs">Tabs</option>
+                        </select>
+
+                        <i style="font-size:0.9em;">Lots of channels? `List` may be more suited</i>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="label">Scrollback</td>
+                    <td class="setting"><input type="text" class="setting-scrollback" value="150" /></td>
                 </tr>
 
                 <tr>
-                    <td>Show joins/parts</td>
-                    <td><input type="checkbox" class="setting-show_joins_parts" /></td>
+                    <td class="label">Show joins/parts</td>
+                    <td class="setting"><input type="checkbox" class="setting-show_joins_parts" /></td>
                 </tr>
-            </table>
 
-            <button class="save">Save</button>âââââââââ
+                <tr>
+                    <td class="label">Show timestamps</td>
+                    <td class="setting"><input type="checkbox" class="setting-show_timestamps" /></td>
+                </tr>
+                
+                <tr>
+                    <td class="label">Mute sounds</td>
+                    <td class="setting"><input type="checkbox" class="setting-mute_sounds" /></td>
+                </tr>
+
+                <tr class="save">
+                    <td colspan="2"><button class="save">Save</button><br/><span class="feedback">Saved!</span></td>
+                </tr>
+            </table>
         </div>
     </script>
 
@@ -192,6 +236,22 @@
     </script>
 
 
+    <script type="text/html" id="tmpl_script_editor">
+        <div style="height:100%;">
+            <style>
+                #kiwi .script_editor .toolbar { padding: 10px 20px; }
+                #kiwi .script_editor .toolbar span.status { margin-left:2em; font-style:italic; }
+                #kiwi .script_editor .toolbar button { height:30px; padding:0 1em; }
+                #kiwi .script_editor .toolbar button i { font-size:1.2em; margin-left:3px; }
+            </style>
+            <div class="script_editor" style="height:100%; position:relative;">
+                <div class="toolbar"><button class="btn_save">Save <i class="icon-save"></i></button><span class="status"></span></div>
+                <div class="editor" style="position:absolute;top:50px;bottom:0px;left:0px;right:0px;"></div>
+            </div>
+        </div>
+    </script>
+
+
 <script>
 /* Script loader (https://github.com/ded/script.js) */
 (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)
@@ -228,10 +288,13 @@
                     'dev/model_gateway.js'
                 ],
                 [
+                    'dev/model_newconnection.js',
                     'dev/model_panellist.js',
+                    'dev/model_networkpanellist.js',
                     'dev/model_panel.js',
                     'dev/model_member.js',
-                    'dev/model_memberlist.js'
+                    'dev/model_memberlist.js',
+                    'dev/model_network.js'
                 ],
                 
                 [
@@ -244,7 +307,8 @@
                 [
                     'dev/applet_settings.js',
                     'dev/applet_nickserv.js',
-                    'dev/applet_chanlist.js'
+                    'dev/applet_chanlist.js',
+                    'dev/applet_scripteditor.js'
                 ],
 
                 [

Theme	+	Theme
Scrollback		Channel list	+ + + Lots of channels? `List` may be more suited +
Scrollback
Show joins/parts		Show joins/parts