From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Thu, 9 May 2013 11:42:22 +0000 (+0100)
Subject: NewConnection dialog positioning
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3735e3901c47a7e1518c2885391e5622e484109c;p=KiwiIRC.git

NewConnection dialog positioning
---

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index e5001ec..49ab2ed 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -166,6 +166,7 @@ html, body { height:100%; }
  * Server selection dialog
  */
 #kiwi .server_select { width:320px; margin:0 auto; overflow:hidden; }
+#kiwi .server_select.initial { margin-top: 3em; }
 #kiwi .server_select .more { display: none; }
 #kiwi .server_select button {  }
 #kiwi .server_select input { }
@@ -564,7 +565,7 @@ html, body { height:100%; }
 
 
 /* The server select dialog */
-#kiwi.theme_relaxed .server_select { padding:3em 0 2em 0; }
+#kiwi.theme_relaxed .server_select { margin-left:auto; margin-right:auto; }
 #kiwi.theme_relaxed .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_relaxed .server_select table tr td { padding:5px; }
 #kiwi.theme_relaxed .server_select button { float:right; padding:3px 7px; }
@@ -1060,7 +1061,7 @@ html, body { height:100%; }
 
 
 /* The server select dialog */
-#kiwi.theme_cli .server_select { width:320px;  padding:3em 0 2em 0; margin: 0 auto; color:#eee; }
+#kiwi.theme_cli .server_select { margin-left:auto; margin-right:auto; color:#eee; }
 #kiwi.theme_cli .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_cli .server_select table tr td { padding:5px; }
 #kiwi.theme_cli .server_select button { float:right; padding:3px 7px; margin-top:10px; }
@@ -1183,7 +1184,10 @@ html, body { height:100%; }
 #kiwi.theme_basic #toolbar .panellist li .part {}
 #kiwi.theme_basic #toolbar .panellist li .part:before { content:"[x]"; }
 
-#kiwi.theme_basic #toolbar .panellist li.server span { }
+#kiwi.theme_basic #toolbar .panellist li.server span { padding-left: 5px; }
+#kiwi.theme_basic.connected #toolbar .panellist li.server:before { content: "\f0ec"; color:#3F9532; }
+#kiwi.theme_basic #toolbar .panellist li.server:before { content: "\f06a"; color:#900; font-size:1.5em; line-height:1em; vertical-align:middle; }
+
 
 /* Tab texts are within a span */
 #kiwi.theme_basic #toolbar .panellist li span  { line-height:20px; vertical-align:middle; display:inline-block; }
@@ -1371,7 +1375,7 @@ html, body { height:100%; }
 
 
 /* The server select dialog */
-#kiwi.theme_basic .server_select { width:320px;  padding:3em 0 2em 0; margin: 0 auto; }
+#kiwi.theme_basic .server_select { margin-left:auto; margin-right:auto; }
 #kiwi.theme_basic .server_select a { text-decoration: none; }
 #kiwi.theme_basic .server_select .more { display: none; width:270px; margin:0 auto; }
 #kiwi.theme_basic .server_select table tr td { padding:5px; }
diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index ed7684e..288ed75 100644
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -78,7 +78,7 @@
     <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="server_details" style="position:relative;width:320px;">
                 <div class="status">Think of a nickname..</div>
 
                 <form>
diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 09c3d38..0423998 100644
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -716,7 +716,20 @@ _kiwi.model.Application = function () {
             var server, port, ssl, password, nick,
                 tmp;
 
-            if (!ev.params[0]) return;
+            // If no server address given, show the new connection dialog
+            if (!ev.params[0]) {
+                tmp = new _kiwi.view.MenuBox('New Connection');
+                tmp.addItem('new_connection', new _kiwi.model.NewConnection().view.$el);
+                tmp.show();
+
+                // Center screen the dialog
+                tmp.$el.offset({
+                    top: (that.view.$el.height() / 2) - (tmp.$el.height() / 2),
+                    left: (that.view.$el.width() / 2) - (tmp.$el.width() / 2)
+                });
+
+                return;
+            }
 
             // Port given in 'host:port' format and no specific port given after a space
             if (ev.params[0].indexOf(':') > 0) {