login: Replace modal box with dropdown menu.

diff --git a/data/static/css/style.css b/data/static/css/style.css
index ce0d0f63b0b7baf75d1546f2432ffdf8cf19ceb8..b15748b566648111b62ba4e9fe3643aaf4c03bcc 100644 (file)
--- a/data/static/css/style.css
+++ b/data/static/css/style.css
@@ -46,3 +46,18 @@ body {
 .ac {
        text-align: center;
 }
+
+.dropdown-login {
+       padding: 15px;
+       padding-bottom: 0px;
+}
+
+.dropdown-login input[type="submit"] {
+       clear: left;
+       width: 100%;
+}
+
+.dropdown-login .links {
+       text-align: center;
+       margin-bottom: 15px;
+}

diff --git a/data/templates/base.html b/data/templates/base.html
index 9876fc0d2cc4662eb7ef5ffbb0002451268a1a8d..2ed20ab6f520c907456039070611dbc01de4ed09 100644 (file)
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -175,7 +175,26 @@
                                                                </li>
                                                        {% else %}
                                                                <li>
-                                                                       <a data-toggle="modal" href="#login">{{ _("Login") }}</a>
+                                                                       <a href="/register">{{ _("Register") }}</a>
+                                                               </li>
+                                                               <li class="dropdown">
+                                                                       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                                                               {{ _("Sign in") }} <b class="caret"></b>
+                                                                       </a>
+                                                                       <div class="dropdown-menu dropdown-login">
+                                                                               <form action="/login" method="POST">
+                                                                                       {% raw xsrf_form_html() %}
+                                                                                       <input class="span3" type="text" name="name" placeholder="{{ _("Username") }}">
+                                                                                       <input class="span3" type="password" name="pass" placeholder="{{ _("Password") }}">
+                                                                                       <input class="btn btn-primary span3" type="submit" value="{{ _("Sign In") }}">
+                                                                               </form>
+
+                                                                               <div class="links">
+                                                                                       <a href="/password-recovery">
+                                                                                               <small>{{ _("Forgot your password?") }}</small>
+                                                                                       </a>
+                                                                               </div>
+                                                                       </div>
                                                                </li>
                                                        {% end %}
                                                </ul>
@@ -196,61 +215,6 @@
                        </div>
                {% end block %}
 
-               {% if not current_user %}
-                       <div class="modal hide fade" id="login">
-                               <form id="loginfrm" class="modal-form form-horizontal" method="POST" action="/login">
-                                       {% raw xsrf_form_html() %}
-
-                                       <div class="modal-header">
-                                               <a class="close" data-dismiss="modal">&times;</a>
-                                               <h3>{{ _("Welcome to Pakfire Build Service!") }}</h3>
-                                       </div>
-
-                                       <div class="modal-body">
-                                               <fieldset>
-                                                       <div class="control-group">
-                                                               <label class="control-label" for="name">{{ _("Username") }}</label>
-                                                               <div class="controls">
-                                                                       <input type="text" class="input-xlarge" id="name" name="name" />
-                                                               </div>
-                                                       </div>
-
-                                                       <div class="control-group">
-                                                               <label class="control-label" for="pass">{{ _("Password") }}</label>
-                                                               <div class="controls">
-                                                                       <input type="password" class="input-xlarge" id="pass" name="pass" />
-                                                               </div>
-                                                       </div>
-                                               </fieldset>
-
-                                               <p>
-                                                       {{ _("Please type your credentials into the form above in order to login.") }}
-                                               </p>
-
-                                               <hr />
-
-                                               <ul>
-                                                       <li>
-                                                               <a href="/register">
-                                                                       {{ _("Register a new account") }}
-                                                               </a>
-                                                       </li>
-                                                       <li>
-                                                               <a href="/password-recovery">
-                                                                       {{ _("Forgot your password?") }}
-                                                               </a>
-                                                       </li>
-                                               </ul>
-                                       </div>
-
-                                       <div class="modal-footer">
-                                               <button class="btn btn-primary" type="submit">{{ _("Login") }}</button>
-                                               <a class="btn" href="#" data-dismiss="modal">{{ _("Cancel") }}</a>
-                                       </div>
-                               </form>
-                       </div>
-               {% end %}
-
                <!-- include javascript files -->
                <script src="{{ static_url("js/jquery.js") }}"></script>
                <script src="{{ static_url("js/bootstrap.min.js") }}"></script>