NewConnection dialog positioning

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index e5001ec6bfe03708e70ef9e09904d7921ccd08e3..49ab2ed18a51bcc870cabecbb94fb7d02ca4aed5 100644 (file)
--- 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 ed7684e01198ab76b896ba87040e56cc98fc8de8..288ed7501162fded4ea5cd3b8f28480de943098a 100644 (file)
--- 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">\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="server_details" style="position:relative;width:320px;">\r
                 <div class="status">Think of a nickname..</div>\r
 \r
                 <form>\r

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 09c3d38d2cb1b024da928703b70a44e8ccf45dfd..04239985485e7a01b2df076bae58eefb2458e8a7 100644 (file)
--- 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,\r
                 tmp;\r
 \r
-            if (!ev.params[0]) return;\r
+            // If no server address given, show the new connection dialog\r
+            if (!ev.params[0]) {\r
+                tmp = new _kiwi.view.MenuBox('New Connection');\r
+                tmp.addItem('new_connection', new _kiwi.model.NewConnection().view.$el);\r
+                tmp.show();\r
+\r
+                // Center screen the dialog\r
+                tmp.$el.offset({\r
+                    top: (that.view.$el.height() / 2) - (tmp.$el.height() / 2),\r
+                    left: (that.view.$el.width() / 2) - (tmp.$el.width() / 2)\r
+                });\r
+\r
+                return;\r
+            }\r
 \r
             // Port given in 'host:port' format and no specific port given after a space\r
             if (ev.params[0].indexOf(':') > 0) {\r