Fix styles of account and group creation page

src/main/twirl/gitbucket/core/account/group.scala.html

@@ -6,32 +6,32 @@
   <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
       <div class="row">
         <div class="col-md-5">
-          <fieldset>
+          <fieldset class="form-group">
             <label for="groupName" class="strong">Group name</label>
             <div>
               <span id="error-groupName" class="error"></span>
             </div>
-            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">URL (Optional)</label>
             <div>
               <span id="error-url" class="error"></span>
             </div>
-            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+            <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
         <div class="col-md-7">
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">Members</label>
             <ul id="member-list" class="collaborator">
             </ul>
             @helper.html.account("memberName", 200)
-            <input type="button" class="btn" value="Add" id="addMember"/>
+            <input type="button" class="btn btn-default" value="Add" id="addMember"/>
             <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
             <div>
               <span class="error" id="error-members"></span>
@@ -42,12 +42,12 @@
       <fieldset class="margin">
         @if(account.isDefined){
           <div class="pull-right">
-            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger btn-lg">Delete Group</a>
           </div>
         }
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        <input type="submit" class="btn btn-success btn-lg" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
         @if(account.isDefined){
-          <a href="@url(account.get.userName)" class="btn">Cancel</a>
+          <a href="@url(account.get.userName)" class="btn btn-default btn-lg">Cancel</a>
         }
       </fieldset>
   </form>

src/main/twirl/gitbucket/core/admin/system.scala.html

@@ -21,7 +21,7 @@
           <label><span class="strong">Base URL</span> (e.g. <code>http://example.com/gitbucket</code>)</label>
           <fieldset>
               <div class="controls">
-                <input type="text" name="baseUrl" id="baseUrl" class="form-control" style="width: 400px" value="@settings.baseUrl"/>
+                <input type="text" name="baseUrl" id="baseUrl" class="form-control" value="@settings.baseUrl"/>
                 <span id="error-baseUrl" class="error"></span>
               </div>
           </fieldset>
@@ -36,7 +36,7 @@
           <hr>
           <label><span class="strong">Information</span> (HTML is available)</label>
           <fieldset>
-            <textarea name="information" class="form-control" style="width: 600px; height: 100px;">@settings.information</textarea>
+            <textarea name="information" class="form-control" style="height: 100px;">@settings.information</textarea>
           </fieldset>
           <!--====================================================================-->
           <!-- Account registration -->

src/main/twirl/gitbucket/core/admin/users/group.scala.html

@@ -6,12 +6,12 @@
     <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newgroup} else {@path/admin/users/@account.get.userName/_editgroup}" validate="true">
       <div class="row">
         <div class="col-md-5">
-          <fieldset>
+          <fieldset class="form-group">
             <label for="groupName" class="strong">Group name</label>
             <div>
               <span id="error-groupName" class="error"></span>
             </div>
-            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
             @if(account.isDefined){
               <label for="removed">
                 <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
@@ -19,20 +19,20 @@
               </label>
             }
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">URL (Optional)</label>
             <div>
               <span id="error-url" class="error"></span>
             </div>
             <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
         <div class="col-md-7">
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">Members</label>
             <ul id="member-list" class="collaborator">
             </ul>

src/main/twirl/gitbucket/core/admin/users/user.scala.html

@@ -3,9 +3,9 @@
 @html.main(if(account.isEmpty) "New User" else "Update User"){
   @admin.html.menu("users"){
     <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newuser} else {@path/admin/users/@account.get.userName/_edituser}" validate="true">
-      <div class="row-fluid">
+      <div class="row">
-        <div class="span6">
+        <div class="col-md-6">
-          <fieldset>
+          <fieldset class="form-group">
             <label for="userName" class="strong">Username:</label>
             <div>
               <span id="error-userName" class="error"></span>
@@ -22,7 +22,7 @@
             }
           </fieldset>
           @if(account.map(_.password.nonEmpty).getOrElse(true)){
-            <fieldset>
+            <fieldset class="form-group">
               <label for="password" class="strong">
                 Password
                 @if(account.isDefined){
@@ -36,21 +36,21 @@
               <input type="password" name="password" id="password" class="form-control" value="" autocomplete="off"/>
             </fieldset>
           }
-          <fieldset>
+          <fieldset class="form-group">
             <label for="fullName" class="strong">Full Name:</label>
             <div>
               <span id="error-fullName" class="error"></span>
             </div>
             <input type="text" name="fullName" id="fullName" class="form-control" value="@account.map(_.fullName)"/>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label for="mailAddress" class="strong">Mail Address:</label>
             <div>
               <span id="error-mailAddress" class="error"></span>
             </div>
             <input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@account.map(_.mailAddress)"/>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">User Type:</label>
             <label class="radio" for="userType_Normal">
               <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
@@ -59,7 +59,7 @@
               <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
             </label>
           </fieldset>
-          <fieldset>
+          <fieldset class="form-group">
             <label class="strong">URL (Optional):</label>
             <div>
               <span id="error-url" class="error"></span>
@@ -67,8 +67,8 @@
             <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
           </fieldset>
         </div>
-        <div class="span6">
+        <div class="col-md-6">
-          <fieldset>
+          <fieldset class="form-group">
             <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>

src/main/twirl/gitbucket/core/helper/account.scala.html

@@ -1,6 +1,6 @@
 @(id: String, width: Int)(implicit context: gitbucket.core.controller.Context)
 @import context._
-<input type="text" name="@id" id="@id" autocomplete="off" style="width: @{width}px; margin-bottom: 0px;"/>
+<input type="text" name="@id" id="@id" class="form-control" autocomplete="off" style="width: @{width}px; margin-bottom: 0px; display: inline; vertical-align: middle;"/>
 <script>
 $(function(){
   $('#@id').typeahead({

src/main/twirl/gitbucket/core/main.scala.html

@@ -12,7 +12,9 @@
     <link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap.css" rel="stylesheet">
+    @*
     <link href="@assets/vendors/bootstrap-theme-github-3.1.1/css/bootstrap-responsive.css" rel="stylesheet">
+    *@
     <link href="@assets/vendors/octicons/octicons.css" rel="stylesheet">
     <link href="@assets/vendors/datepicker/css/datepicker.css" rel="stylesheet">
     <link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
@@ -24,6 +26,7 @@
     <script src="@assets/common/js/validation.js"></script>
     <script src="@assets/common/js/gitbucket.js"></script>
     <script src="@assets/vendors/bootstrap-theme-github-3.1.1/js/bootstrap.js"></script>
+    <script src="@assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js"></script>
     <script src="@assets/vendors/datepicker/js/bootstrap-datepicker.js"></script>
     <script src="@assets/vendors/colorpicker/js/bootstrap-colorpicker.js"></script>
     <script src="@assets/vendors/google-code-prettify/prettify.js"></script>

src/main/webapp/assets/common/css/gitbucket.css

@@ -1509,7 +1509,8 @@ table.diff tbody tr.not-diff:hover td{
 /****************************************************************************/
 ul.collaborator {
   list-style-type: none;
-  margin-left: 0px;
+  margin: 0px;
+  padding-left: 0px;
 }
 
 ul.collaborator li {

src/main/webapp/assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js

@@ -0,0 +1,484 @@
+/* =============================================================
+ * bootstrap3-typeahead.js v3.1.0
+ * https://github.com/bassjobsen/Bootstrap-3-Typeahead
+ * =============================================================
+ * Original written by @mdo and @fat
+ * =============================================================
+ * Copyright 2014 Bass Jobsen @bassjobsen
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+(function (root, factory) {
+
+  'use strict';
+
+  // CommonJS module is defined
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = factory(require('jquery'));
+  }
+  // AMD module is defined
+  else if (typeof define === 'function' && define.amd) {
+    define(['jquery'], function ($) {
+      return factory ($);
+    });
+  } else {
+    factory(root.jQuery);
+  }
+
+}(this, function ($) {
+
+  'use strict';
+  // jshint laxcomma: true
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element);
+    this.options = $.extend({}, $.fn.typeahead.defaults, options);
+    this.matcher = this.options.matcher || this.matcher;
+    this.sorter = this.options.sorter || this.sorter;
+    this.select = this.options.select || this.select;
+    this.autoSelect = typeof this.options.autoSelect == 'boolean' ? this.options.autoSelect : true;
+    this.highlighter = this.options.highlighter || this.highlighter;
+    this.render = this.options.render || this.render;
+    this.updater = this.options.updater || this.updater;
+    this.displayText = this.options.displayText || this.displayText;
+    this.source = this.options.source;
+    this.delay = this.options.delay;
+    this.$menu = $(this.options.menu);
+    this.$appendTo = this.options.appendTo ? $(this.options.appendTo) : null;
+    this.shown = false;
+    this.listen();
+    this.showHintOnFocus = typeof this.options.showHintOnFocus == 'boolean' ? this.options.showHintOnFocus : false;
+    this.afterSelect = this.options.afterSelect;
+    this.addItem = false;
+  };
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead,
+
+    select: function () {
+      var val = this.$menu.find('.active').data('value');
+      this.$element.data('active', val);
+      if(this.autoSelect || val) {
+        var newVal = this.updater(val);
+        // Updater can be set to any random functions via "options" parameter in constructor above.
+        // Add null check for cases when upadter returns void or undefined.
+        if (!newVal) {
+          newVal = "";	
+        }
+        this.$element
+          .val(this.displayText(newVal) || newVal)
+          .change();
+        this.afterSelect(newVal);
+      }
+      return this.hide();
+    },
+
+    updater: function (item) {
+      return item;
+    },
+
+    setSource: function (source) {
+      this.source = source;
+    },
+
+    show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      }), scrollHeight;
+
+      scrollHeight = typeof this.options.scrollHeight == 'function' ?
+          this.options.scrollHeight.call() :
+          this.options.scrollHeight;
+
+      var element;
+      if (this.shown) {
+      	element = this.$menu;
+      } else if (this.$appendTo) {
+      	element = this.$menu.appendTo(this.$appendTo);
+      } else {
+      	element = this.$menu.insertAfter(this.$element);
+      }
+      element.css({
+          top: pos.top + pos.height + scrollHeight
+        , left: pos.left
+        })
+        .show();
+
+      this.shown = true;
+      return this;
+    },
+
+    hide: function () {
+      this.$menu.hide();
+      this.shown = false;
+      return this;
+    },
+
+    lookup: function (query) {
+      var items;
+      if (typeof(query) != 'undefined' && query !== null) {
+        this.query = query;
+      } else {
+        this.query = this.$element.val() ||  '';
+      }
+
+      if (this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this;
+      }
+
+      var worker = $.proxy(function() {
+
+        if($.isFunction(this.source)) this.source(this.query, $.proxy(this.process, this));
+        else if (this.source) {
+          this.process(this.source);
+        }
+      }, this);
+
+      clearTimeout(this.lookupWorker);
+      this.lookupWorker = setTimeout(worker, this.delay);
+    },
+
+    process: function (items) {
+      var that = this;
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item);
+      });
+
+      items = this.sorter(items);
+
+      if (!items.length && !this.options.addItem) {
+        return this.shown ? this.hide() : this;
+      }
+
+      if (items.length > 0) {
+        this.$element.data('active', items[0]);
+      } else {
+        this.$element.data('active', null);
+      }
+
+      // Add item
+      if (this.options.addItem){
+        items.push(this.options.addItem);
+      }
+
+      if (this.options.items == 'all') {
+        return this.render(items).show();
+      } else {
+        return this.render(items.slice(0, this.options.items)).show();
+      }
+    },
+
+    matcher: function (item) {
+    var it = this.displayText(item);
+      return ~it.toLowerCase().indexOf(this.query.toLowerCase());
+    },
+
+    sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item;
+
+      while ((item = items.shift())) {
+        var it = this.displayText(item);
+        if (!it.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item);
+        else if (~it.indexOf(this.query)) caseSensitive.push(item);
+        else caseInsensitive.push(item);
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive);
+    },
+
+    highlighter: function (item) {
+          var html = $('<div></div>');
+          var query = this.query;
+          var i = item.toLowerCase().indexOf(query.toLowerCase());
+          var len, leftPart, middlePart, rightPart, strong;
+          len = query.length;
+          if(len === 0){
+              return html.text(item).html();
+          }
+          while (i > -1) {
+              leftPart = item.substr(0, i);
+              middlePart = item.substr(i, len);
+              rightPart = item.substr(i + len);
+              strong = $('<strong></strong>').text(middlePart);
+              html
+                  .append(document.createTextNode(leftPart))
+                  .append(strong);
+              item = rightPart;
+              i = item.toLowerCase().indexOf(query.toLowerCase());
+          }
+          return html.append(document.createTextNode(item)).html();
+    },
+
+    render: function (items) {
+      var that = this;
+      var self = this;
+      var activeFound = false;
+      items = $(items).map(function (i, item) {
+        var text = self.displayText(item);
+        i = $(that.options.item).data('value', item);
+        i.find('a').html(that.highlighter(text));
+        if (text == self.$element.val()) {
+            i.addClass('active');
+            self.$element.data('active', item);
+            activeFound = true;
+        }
+        return i[0];
+      });
+
+      if (this.autoSelect && !activeFound) {
+        items.first().addClass('active');
+        this.$element.data('active', items.first().data('value'));
+      }
+      this.$menu.html(items);
+      return this;
+    },
+
+    displayText: function(item) {
+      return typeof item !== 'undefined' && typeof item.name != 'undefined' && item.name || item;
+    },
+
+    next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next();
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0]);
+      }
+
+      next.addClass('active');
+    },
+
+    prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev();
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last();
+      }
+
+      prev.addClass('active');
+    },
+
+    listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this));
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this));
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this));
+    },
+
+    destroy : function () {
+      this.$element.data('typeahead',null);
+      this.$element.data('active',null);
+      this.$element
+        .off('focus')
+        .off('blur')
+        .off('keypress')
+        .off('keyup');
+
+      if (this.eventSupported('keydown')) {
+        this.$element.off('keydown');
+      }
+
+      this.$menu.remove();
+    },
+
+    eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element;
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;');
+        isSupported = typeof this.$element[eventName] === 'function';
+      }
+      return isSupported;
+    },
+
+    move: function (e) {
+      if (!this.shown) return;
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault();
+          break;
+
+        case 38: // up arrow
+          // with the shiftKey (this is actually the left parenthesis)
+          if (e.shiftKey) return;
+          e.preventDefault();
+          this.prev();
+          break;
+
+        case 40: // down arrow
+          // with the shiftKey (this is actually the right parenthesis)
+          if (e.shiftKey) return;
+          e.preventDefault();
+          this.next();
+          break;
+      }
+    },
+
+    keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]);
+      if (!this.shown && e.keyCode == 40) {
+        this.lookup();
+      } else {
+        this.move(e);
+      }
+    },
+
+    keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return;
+      this.move(e);
+    },
+
+    keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break;
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return;
+          this.select();
+          break;
+
+        case 27: // escape
+          if (!this.shown) return;
+          this.hide();
+          break;
+        default:
+          this.lookup();
+      }
+
+      e.preventDefault();
+   },
+
+   focus: function (e) {
+      if (!this.focused) {
+        this.focused = true;
+        if (this.options.showHintOnFocus) {
+          this.lookup('');
+        }
+      }
+    },
+
+    blur: function (e) {
+      this.focused = false;
+      if (!this.mousedover && this.shown) this.hide();
+    },
+
+    click: function (e) {
+      e.preventDefault();
+      this.select();
+      this.$element.focus();
+    },
+
+    mouseenter: function (e) {
+      this.mousedover = true;
+      this.$menu.find('.active').removeClass('active');
+      $(e.currentTarget).addClass('active');
+    },
+
+    mouseleave: function (e) {
+      this.mousedover = false;
+      if (!this.focused && this.shown) this.hide();
+    }
+
+  };
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead;
+
+  $.fn.typeahead = function (option) {
+	var arg = arguments;
+     if (typeof option == 'string' && option == 'getActive') {
+        return this.data('active');
+     }
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option;
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)));
+      if (typeof option == 'string') {
+        if (arg.length > 1) {
+          data[option].apply(data, Array.prototype.slice.call(arg ,1));
+        } else {
+          data[option]();
+        }
+      }
+    });
+  };
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu" role="listbox"></ul>'
+  , item: '<li><a class="dropdown-item" href="#" role="option"></a></li>'
+  , minLength: 1
+  , scrollHeight: 0
+  , autoSelect: true
+  , afterSelect: $.noop
+  , addItem: false
+  , delay: 0
+  };
+
+  $.fn.typeahead.Constructor = Typeahead;
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old;
+    return this;
+  };
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this);
+    if ($this.data('typeahead')) return;
+    $this.typeahead($this.data());
+  });
+
+}));