Client: Applying the nick + channel given in the URL properly #242

[KiwiIRC.git] / client / assets / dev / index.html.tmpl

diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index b677774342b48ca9de97a88d13b6fffaf215389b..6afde0dae9edf8d0dd951f985327b3360a21757f 100644 (file)
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -66,8 +66,6 @@
             <a class="query"><i class="icon-comment"></i>Message</a>\r
             <a class="info"><i class="icon-info-sign"></i>Info</a>\r
             <a class="slap"><i class="icon-user-md"></i>Slap!</a>\r
-\r
-            <div class="divider-horizontal"></div>\r
         </div>\r
     </script>\r
     \r
@@ -77,10 +75,24 @@
         </form>\r
     </script>\r
 \r
+    <script type="text/html" id="tmpl_new_connection_info">\r
+        <div style="margin:1em 20px;">\r
+            <img src="https://kiwiirc.com/img/ico.png" alt="KiwiIRC Logo" title="Kiwi IRC" style="display:block; margin:0 auto;"/> <br />\r
+            <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>\r
+\r
+            <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>\r
+        </div>\r
+    </script>\r
+\r
     <script type="text/html" id="tmpl_server_select">\r
         <div class="server_select">\r
 \r
-            <div class="server_details" style="position:relative;float:left;width:320px;padding-right:3em;margin-top:50px;">\r
+            <div class="side_panel" style="position:absolute;top:0px;left:320px;">\r
+                <div class="content" style="position:relative;width:300px;">\r
+                </div>\r
+            </div>\r
+\r
+            <div class="server_details" style="position:relative;width:320px;">\r
                 <div class="status">Think of a nickname..</div>\r
 \r
                 <form>\r
@@ -104,7 +116,18 @@
 \r
                             <tr class="channel">\r
                                 <td><label for="server_select_channel">Channel</label></td>\r
-                                <td><input type="text" class="channel" id="server_select_channel"><input type="hidden" class="channel_key"></td>\r
+                                <td><input type="text" class="channel" id="server_select_channel"></td>\r
+                            </tr>\r
+\r
+                            <tr class="have_key">\r
+                                <td colspan="2">\r
+                                    <label for="server_select_show_channel_key">Channel requires a key</label> <input type="checkbox" id="server_select_show_channel_key" style="width:auto;" />\r
+                                </td>\r
+                            </tr>\r
+\r
+                            <tr class="key">\r
+                                <td><label for="server_select_channel_key">Key</label></td>\r
+                                <td><input type="text" class="channel_key" id="server_select_channel_key"></td>\r
                             </tr>\r
 \r
                             <tr class="start">\r
@@ -270,7 +293,8 @@
                     'dev/model_networkpanellist.js',\r
                     'dev/model_panel.js',\r
                     'dev/model_member.js',\r
-                    'dev/model_memberlist.js'\r
+                    'dev/model_memberlist.js',\r
+                    'dev/model_network.js'\r
                 ],\r
                 \r
                 [\r