hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update bootstrap in ACP

Browse Source 
Also fixed #4872 by moving user creation modal to root level
(outside of .panel)
v1.18.x
Julian Lam 9 years ago
parent 2544287269
commit 2428d5e442
13 changed files with 174 additions and 173 deletions
Show Stats Download Patch File Download Diff File

4
public/less/admin/bootstrap/bootstrap.less vendored
Unescape Escape View File

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.6 (http://getbootstrap.com) * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */

2
public/less/admin/bootstrap/button-groups.less
Unescape Escape View File

@ -59,7 +59,7 @@
.border-right-radius(0); .border-right-radius(0);
} }
} }
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it // Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it
.btn-group > .btn:last-child:not(:first-child), .btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child) { .btn-group > .dropdown-toggle:not(:first-child) {
.border-left-radius(0); .border-left-radius(0);

2
public/less/admin/bootstrap/forms.less
Unescape Escape View File

@ -181,7 +181,7 @@ input[type="search"] {
// set a pixel line-height that matches the given height of the input, but only // set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848 // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
// //
// Note that as of 8.3, iOS doesn't support `datetime` or `week`. // Note that as of 9.3, iOS doesn't support `week`.
@media screen and (-webkit-min-device-pixel-ratio: 0) { @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"], input[type="date"],

2
public/less/admin/bootstrap/input-groups.less
Unescape Escape View File

@ -29,7 +29,7 @@
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
&:focus { &:focus {
z-index: 3; z-index: 3;
} }

6
public/less/admin/bootstrap/mixins/tab-focus.less
Unescape Escape View File

@ -1,9 +1,9 @@
// WebKit-style focus // WebKit-style focus
.tab-focus() { .tab-focus() {
// Default // WebKit-specific. Other browsers will keep their default outline style.
outline: thin dotted; // (Initially tried to also force default via `outline: initial`,
// WebKit // but that seems to erroneously remove the outline in Firefox altogether.)
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }

2
public/less/admin/bootstrap/panels.less
Unescape Escape View File

@ -214,7 +214,7 @@
} }
// Collapsable panels (aka, accordion) // Collapsible panels (aka, accordion)
// //
// Wrap a series of panels in `.panel-group` to turn them into an accordion with // Wrap a series of panels in `.panel-group` to turn them into an accordion with
// the help of our collapse JavaScript plugin. // the help of our collapse JavaScript plugin.

2
public/less/admin/bootstrap/scaffolding.less
Unescape Escape View File

@ -120,7 +120,7 @@ hr {
// Only display content to screen readers // Only display content to screen readers
// //
// See: http://a11yproject.com/posts/how-to-hide-content/ // See: http://a11yproject.com/posts/how-to-hide-content
.sr-only { .sr-only {
position: absolute; position: absolute;

4
public/less/admin/bootstrap/theme.less
Unescape Escape View File

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.6 (http://getbootstrap.com) * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */

184
public/less/admin/bootstrap/variables.less
Unescape Escape View File

@ -1,4 +1,4 @@
// Paper 3.3.5 //
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
@ -9,16 +9,16 @@
@gray-base: #000; @gray-base: #000;
@gray-darker: lighten(@gray-base, 13.5%); // #222 @gray-darker: lighten(@gray-base, 13.5%); // #222
@gray-dark: #212121; @gray-dark: lighten(@gray-base, 20%); // #333
@gray: #666; @gray: lighten(@gray-base, 33.5%); // #555
@gray-light: #bbb; @gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee @gray-lighter: lighten(@gray-base, 93.5%); // #eee
@brand-primary: #2196F3; @brand-primary: darken(#428bca, 6.5%); // #337ab7
@brand-success: #4CAF50; @brand-success: #5cb85c;
@brand-info: #9C27B0; @brand-info: #5bc0de;
@brand-warning: #ff9800; @brand-warning: #f0ad4e;
@brand-danger: #e51c23; @brand-danger: #d9534f;
//== Scaffolding //== Scaffolding
@ -28,7 +28,7 @@
//** Background color for `<body>`. //** Background color for `<body>`.
@body-bg: #fff; @body-bg: #fff;
//** Global text color on `<body>`. //** Global text color on `<body>`.
@text-color: @gray; @text-color: @gray-dark;
//** Global textual link color. //** Global textual link color.
@link-color: @brand-primary; @link-color: @brand-primary;
@ -42,33 +42,33 @@
// //
//## Font, line-height, and color for body text, headings, and more. //## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif; @font-family-base: @font-family-sans-serif;
@font-size-base: 13px; @font-size-base: 14px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px @font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px @font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@font-size-h1: 56px; @font-size-h1: floor((@font-size-base * 2.6)); // ~36px
@font-size-h2: 45px; @font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h3: 34px; @font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
@font-size-h4: 24px; @font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: 20px; @font-size-h5: @font-size-base;
@font-size-h6: 14px; @font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
//** Unit-less `line-height` for use in components like buttons. //** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.846; // 20/14 @line-height-base: 1.428571429; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px @line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`. //** By default, this inherits from the `<body>`.
@headings-font-family: inherit; @headings-font-family: inherit;
@headings-font-weight: 400; @headings-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: #444; @headings-color: inherit;
//== Iconography //== Iconography
@ -88,7 +88,7 @@
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 6px; @padding-base-vertical: 6px;
@padding-base-horizontal: 16px; @padding-base-horizontal: 12px;
@padding-large-vertical: 10px; @padding-large-vertical: 10px;
@padding-large-horizontal: 16px; @padding-large-horizontal: 16px;
@ -102,16 +102,16 @@
@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome @line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
@line-height-small: 1.5; @line-height-small: 1.5;
@border-radius-base: 0px; @border-radius-base: 4px;
@border-radius-large: 0px; @border-radius-large: 6px;
@border-radius-small: 0px; @border-radius-small: 3px;
//** Global color for active items (e.g., navs or dropdowns). //** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff; @component-active-color: #fff;
//** Global background color for active items (e.g., navs or dropdowns). //** Global background color for active items (e.g., navs or dropdowns).
@component-active-bg: @brand-primary; @component-active-bg: @brand-primary;
//** Width of the `border` for generating carets that indicator dropdowns. //** Width of the `border` for generating carets that indicate dropdowns.
@caret-width-base: 4px; @caret-width-base: 4px;
//** Carets increase slightly in size for larger components. //** Carets increase slightly in size for larger components.
@caret-width-large: 5px; @caret-width-large: 5px;
@ -144,29 +144,29 @@
@btn-font-weight: normal; @btn-font-weight: normal;
@btn-default-color: #444; @btn-default-color: #333;
@btn-default-bg: #fff; @btn-default-bg: #fff;
@btn-default-border: transparent; @btn-default-border: #ccc;
@btn-primary-color: #fff; @btn-primary-color: #fff;
@btn-primary-bg: @brand-primary; @btn-primary-bg: @brand-primary;
@btn-primary-border: transparent; @btn-primary-border: darken(@btn-primary-bg, 5%);
@btn-success-color: #fff; @btn-success-color: #fff;
@btn-success-bg: @brand-success; @btn-success-bg: @brand-success;
@btn-success-border: transparent; @btn-success-border: darken(@btn-success-bg, 5%);
@btn-info-color: #fff; @btn-info-color: #fff;
@btn-info-bg: @brand-info; @btn-info-bg: @brand-info;
@btn-info-border: transparent; @btn-info-border: darken(@btn-info-bg, 5%);
@btn-warning-color: #fff; @btn-warning-color: #fff;
@btn-warning-bg: @brand-warning; @btn-warning-bg: @brand-warning;
@btn-warning-border: transparent; @btn-warning-border: darken(@btn-warning-bg, 5%);
@btn-danger-color: #fff; @btn-danger-color: #fff;
@btn-danger-bg: @brand-danger; @btn-danger-bg: @brand-danger;
@btn-danger-border: transparent; @btn-danger-border: darken(@btn-danger-bg, 5%);
@btn-link-disabled-color: @gray-light; @btn-link-disabled-color: @gray-light;
@ -181,14 +181,14 @@
//## //##
//** `<input>` background color //** `<input>` background color
@input-bg: transparent; @input-bg: #fff;
//** `<input disabled>` background color //** `<input disabled>` background color
@input-bg-disabled: transparent; @input-bg-disabled: @gray-lighter;
//** Text color for `<input>`s //** Text color for `<input>`s
@input-color: @gray; @input-color: @gray;
//** `<input>` border color //** `<input>` border color
@input-border: transparent; @input-border: #ccc;
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
//** Default `.form-control` border radius //** Default `.form-control` border radius
@ -203,7 +203,7 @@
@input-border-focus: #66afe9; @input-border-focus: #66afe9;
//** Placeholder text color //** Placeholder text color
@input-color-placeholder: @gray-light; @input-color-placeholder: #999;
//** Default `.form-control` height //** Default `.form-control` height
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@ -219,7 +219,7 @@
@legend-border-color: #e5e5e5; @legend-border-color: #e5e5e5;
//** Background color for textual input addons //** Background color for textual input addons
@input-group-addon-bg: transparent; @input-group-addon-bg: @gray-lighter;
//** Border color for textual input addons //** Border color for textual input addons
@input-group-addon-border-color: @input-border; @input-group-addon-border-color: @input-border;
@ -241,11 +241,11 @@
@dropdown-divider-bg: #e5e5e5; @dropdown-divider-bg: #e5e5e5;
//** Dropdown link text color. //** Dropdown link text color.
@dropdown-link-color: @text-color; @dropdown-link-color: @gray-dark;
//** Hover color for dropdown links. //** Hover color for dropdown links.
@dropdown-link-hover-color: darken(@gray-dark, 5%); @dropdown-link-hover-color: darken(@gray-dark, 5%);
//** Hover background for dropdown links. //** Hover background for dropdown links.
@dropdown-link-hover-bg: @gray-lighter; @dropdown-link-hover-bg: #f5f5f5;
//** Active dropdown menu item text color. //** Active dropdown menu item text color.
@dropdown-link-active-color: @component-active-color; @dropdown-link-active-color: @component-active-color;
@ -259,7 +259,7 @@
@dropdown-header-color: @gray-light; @dropdown-header-color: @gray-light;
//** Deprecated `@dropdown-caret-color` as of v3.1.0 //** Deprecated `@dropdown-caret-color` as of v3.1.0
@dropdown-caret-color: @gray-light; @dropdown-caret-color: #000;
//-- Z-index master list //-- Z-index master list
@ -357,45 +357,45 @@
//## //##
// Basics of a navbar // Basics of a navbar
@navbar-height: 64px; @navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed; @navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-collapse-max-height: 340px; @navbar-collapse-max-height: 340px;
@navbar-default-color: @gray-light; @navbar-default-color: #777;
@navbar-default-bg: #fff; @navbar-default-bg: #f8f8f8;
@navbar-default-border: transparent; @navbar-default-border: darken(@navbar-default-bg, 6.5%);
// Navbar links // Navbar links
@navbar-default-link-color: @gray; @navbar-default-link-color: #777;
@navbar-default-link-hover-color: @gray-dark; @navbar-default-link-hover-color: #333;
@navbar-default-link-hover-bg: transparent; @navbar-default-link-hover-bg: transparent;
@navbar-default-link-active-color: @gray-dark; @navbar-default-link-active-color: #555;
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%); @navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-disabled-color: #ccc; @navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent; @navbar-default-link-disabled-bg: transparent;
// Navbar brand label // Navbar brand label
@navbar-default-brand-color: @navbar-default-link-color; @navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: @navbar-default-link-hover-color; @navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
@navbar-default-brand-hover-bg: transparent; @navbar-default-brand-hover-bg: transparent;
// Navbar toggle // Navbar toggle
@navbar-default-toggle-hover-bg: transparent; @navbar-default-toggle-hover-bg: #ddd;
@navbar-default-toggle-icon-bar-bg: rgba(0,0,0,0.5); @navbar-default-toggle-icon-bar-bg: #888;
@navbar-default-toggle-border-color: transparent; @navbar-default-toggle-border-color: #ddd;
//=== Inverted navbar //=== Inverted navbar
// Reset inverted navbar basics // Reset inverted navbar basics
@navbar-inverse-color: @gray-light; @navbar-inverse-color: lighten(@gray-light, 15%);
@navbar-inverse-bg: @brand-primary; @navbar-inverse-bg: #222;
@navbar-inverse-border: transparent; @navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links // Inverted navbar links
@navbar-inverse-link-color: lighten(@brand-primary, 30%); @navbar-inverse-link-color: lighten(@gray-light, 15%);
@navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@ -408,10 +408,10 @@
@navbar-inverse-brand-hover-color: #fff; @navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent; @navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar toggle\ // Inverted navbar toggle
@navbar-inverse-toggle-hover-bg: transparent; @navbar-inverse-toggle-hover-bg: #333;
@navbar-inverse-toggle-icon-bar-bg: rgba(0,0,0,0.5); @navbar-inverse-toggle-icon-bar-bg: #fff;
@navbar-inverse-toggle-border-color: transparent; @navbar-inverse-toggle-border-color: #333;
//== Navs //== Navs
@ -426,15 +426,15 @@
@nav-disabled-link-hover-color: @gray-light; @nav-disabled-link-hover-color: @gray-light;
//== Tabs //== Tabs
@nav-tabs-border-color: transparent; @nav-tabs-border-color: #ddd;
@nav-tabs-link-hover-border-color: @gray-lighter; @nav-tabs-link-hover-border-color: @gray-lighter;
@nav-tabs-active-link-hover-bg: transparent; @nav-tabs-active-link-hover-bg: @body-bg;
@nav-tabs-active-link-hover-color: @gray; @nav-tabs-active-link-hover-color: @gray;
@nav-tabs-active-link-hover-border-color: transparent; @nav-tabs-active-link-hover-border-color: #ddd;
@nav-tabs-justified-link-border-color: @nav-tabs-border-color; @nav-tabs-justified-link-border-color: #ddd;
@nav-tabs-justified-active-link-border-color: @body-bg; @nav-tabs-justified-active-link-border-color: @body-bg;
//== Pills //== Pills
@ -486,8 +486,8 @@
@jumbotron-padding: 30px; @jumbotron-padding: 30px;
@jumbotron-color: inherit; @jumbotron-color: inherit;
@jumbotron-bg: #f9f9f9; @jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: @headings-color; @jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil((@font-size-base * 1.5)); @jumbotron-font-size: ceil((@font-size-base * 1.5));
@jumbotron-heading-font-size: ceil((@font-size-base * 4.5)); @jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
@ -496,20 +496,20 @@
// //
//## Define colors for form feedback states and, by default, alerts. //## Define colors for form feedback states and, by default, alerts.
@state-success-text: @brand-success; @state-success-text: #3c763d;
@state-success-bg: #dff0d8; @state-success-bg: #dff0d8;
@state-success-border: darken(spin(@state-success-bg, -10), 5%); @state-success-border: darken(spin(@state-success-bg, -10), 5%);
@state-info-text: @brand-info; @state-info-text: #31708f;
@state-info-bg: #e1bee7; @state-info-bg: #d9edf7;
@state-info-border: darken(spin(@state-info-bg, -10), 7%); @state-info-border: darken(spin(@state-info-bg, -10), 7%);
@state-warning-text: @brand-warning; @state-warning-text: #8a6d3b;
@state-warning-bg: #ffe0b2; @state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 5%); @state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
@state-danger-text: @brand-danger; @state-danger-text: #a94442;
@state-danger-bg: #f9bdbb; @state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
@ -522,7 +522,7 @@
//** Tooltip text color //** Tooltip text color
@tooltip-color: #fff; @tooltip-color: #fff;
//** Tooltip background color //** Tooltip background color
@tooltip-bg: #727272; @tooltip-bg: #000;
@tooltip-opacity: .9; @tooltip-opacity: .9;
//** Tooltip arrow width //** Tooltip arrow width
@ -540,9 +540,9 @@
//** Popover maximum width //** Popover maximum width
@popover-max-width: 276px; @popover-max-width: 276px;
//** Popover border color //** Popover border color
@popover-border-color: transparent; @popover-border-color: rgba(0,0,0,.2);
//** Popover fallback border color //** Popover fallback border color
@popover-fallback-border-color: transparent; @popover-fallback-border-color: #ccc;
//** Popover title background color //** Popover title background color
@popover-title-bg: darken(@popover-bg, 3%); @popover-title-bg: darken(@popover-bg, 3%);
@ -555,7 +555,7 @@
//** Popover outer arrow width //** Popover outer arrow width
@popover-arrow-outer-width: (@popover-arrow-width + 1); @popover-arrow-outer-width: (@popover-arrow-width + 1);
//** Popover outer arrow color //** Popover outer arrow color
@popover-arrow-outer-color: fadein(@popover-border-color, 7.5%); @popover-arrow-outer-color: fadein(@popover-border-color, 5%);
//** Popover outer arrow fallback color //** Popover outer arrow fallback color
@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%); @popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);
@ -598,7 +598,7 @@
//** Background color of modal content area //** Background color of modal content area
@modal-content-bg: #fff; @modal-content-bg: #fff;
//** Modal content border color //** Modal content border color
@modal-content-border-color: transparent; @modal-content-border-color: rgba(0,0,0,.2);
//** Modal content border color **for IE8** //** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999; @modal-content-fallback-border-color: #999;
@ -607,7 +607,7 @@
//** Modal backdrop opacity //** Modal backdrop opacity
@modal-backdrop-opacity: .5; @modal-backdrop-opacity: .5;
//** Modal header border color //** Modal header border color
@modal-header-border-color: transparent; @modal-header-border-color: #e5e5e5;
//** Modal footer border color //** Modal footer border color
@modal-footer-border-color: @modal-header-border-color; @modal-footer-border-color: @modal-header-border-color;
@ -720,21 +720,21 @@
@panel-primary-border: @brand-primary; @panel-primary-border: @brand-primary;
@panel-primary-heading-bg: @brand-primary; @panel-primary-heading-bg: @brand-primary;
@panel-success-text: #fff; @panel-success-text: @state-success-text;
@panel-success-border: @state-success-border; @panel-success-border: @state-success-border;
@panel-success-heading-bg: @brand-success; @panel-success-heading-bg: @state-success-bg;
@panel-info-text: #fff; @panel-info-text: @state-info-text;
@panel-info-border: @state-info-border; @panel-info-border: @state-info-border;
@panel-info-heading-bg: @brand-info; @panel-info-heading-bg: @state-info-bg;
@panel-warning-text: #fff; @panel-warning-text: @state-warning-text;
@panel-warning-border: @state-warning-border; @panel-warning-border: @state-warning-border;
@panel-warning-heading-bg: @brand-warning; @panel-warning-heading-bg: @state-warning-bg;
@panel-danger-text: #fff; @panel-danger-text: @state-danger-text;
@panel-danger-border: @state-danger-border; @panel-danger-border: @state-danger-border;
@panel-danger-heading-bg: @brand-danger; @panel-danger-heading-bg: @state-danger-bg;
//== Thumbnails //== Thumbnails
@ -760,8 +760,8 @@
// //
//## //##
@well-bg: #f9f9f9; @well-bg: #f5f5f5;
@well-border: transparent; @well-border: darken(@well-bg, 7%);
//== Badges //== Badges
@ -778,7 +778,7 @@
//** Badge background color in active nav link //** Badge background color in active nav link
@badge-active-bg: #fff; @badge-active-bg: #fff;
@badge-font-weight: normal; @badge-font-weight: bold;
@badge-line-height: 1; @badge-line-height: 1;
@badge-border-radius: 10px; @badge-border-radius: 10px;
@ -820,9 +820,9 @@
// //
//## //##
@close-font-weight: normal; @close-font-weight: bold;
@close-color: #000; @close-color: #000;
@close-text-shadow: none; @close-text-shadow: 0 1px 0 #fff;
//== Code //== Code

75
public/src/admin/manage/users.js
Unescape Escape View File

@ -231,41 +231,62 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
}); });
function handleUserCreate() { function handleUserCreate() {
var errorEl = $('#create-modal-error');
$('#createUser').on('click', function() { $('#createUser').on('click', function() {
$('#create-modal').modal('show'); templates.parse('admin/partials/create_user_modal', {}, function(html) {
$('#create-modal form')[0].reset(); translator.translate(html, function(html) {
errorEl.addClass('hide'); bootbox.dialog({
message: html,
title: 'Create User',
onEscape: true,
buttons: {
cancel: {
label: 'Cancel',
className: 'btn-link'
},
create: {
label: 'Create',
className: 'btn-primary',
callback: function(e) {
createUser.call(this);
return false;
}
}
}
});
});
});
}); });
}
$('#create-modal-go').on('click', function() { function createUser() {
var username = $('#create-user-name').val(), var modal = this;
email = $('#create-user-email').val(), var username = document.getElementById('create-user-name').value;
password = $('#create-user-password').val(), var email = document.getElementById('create-user-email').value;
passwordAgain = $('#create-user-password-again').val(); var password = document.getElementById('create-user-password').value;
var passwordAgain = document.getElementById('create-user-password-again').value;
var errorEl = $('#create-modal-error');
if (password !== passwordAgain) { if (password !== passwordAgain) {
return errorEl.html('<strong>Error</strong><p>Passwords must match!</p>').removeClass('hide'); return errorEl.html('<strong>Error</strong><p>Passwords must match!</p>').removeClass('hide');
} }
var user = { var user = {
username: username, username: username,
email: email, email: email,
password: password password: password
}; };
socket.emit('admin.user.createUser', user, function(err) { socket.emit('admin.user.createUser', user, function(err) {
if(err) { if(err) {
return errorEl.translateHtml('<strong>Error</strong><p>' + err.message + '</p>').removeClass('hide'); return errorEl.translateHtml('<strong>Error</strong><p>' + err.message + '</p>').removeClass('hide');
} }
$('#create-modal').modal('hide');
$('#create-modal').on('hidden.bs.modal', function() {
ajaxify.refresh();
});
app.alertSuccess('User created!');
});
modal.modal('hide');
modal.on('hidden.bs.modal', function() {
ajaxify.refresh();
});
app.alertSuccess('User created!');
}); });
} }

3
src/meta/css.js
Unescape Escape View File

@ -39,8 +39,7 @@ module.exports = function(Meta) {
paths = [ paths = [
baseThemePath, baseThemePath,
path.join(__dirname, '../../node_modules'), path.join(__dirname, '../../node_modules'),
path.join(__dirname, '../../public/vendor/fontawesome/less'), path.join(__dirname, '../../public/vendor/fontawesome/less')
path.join(__dirname, '../../public/vendor/bootstrap/less')
], ],
source = '@import "font-awesome";'; source = '@import "font-awesome";';

40
src/views/admin/manage/users.tpl
Unescape Escape View File

@ -94,46 +94,6 @@
</ul> </ul>
<!-- IMPORT partials/paginator.tpl --> <!-- IMPORT partials/paginator.tpl -->
<div class="modal fade" id="create-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Create User</h4>
</div>
<div class="modal-body">
<div class="alert alert-danger hide" id="create-modal-error"></div>
<form>
<div class="form-group">
<label for="group-name">User Name</label>
<input type="text" class="form-control" id="create-user-name" placeholder="User Name" />
</div>
<div class="form-group">
<label for="group-name">Email</label>
<input type="text" class="form-control" id="create-user-email" placeholder="Email of this user" />
</div>
<div class="form-group">
<label for="group-name">Password</label>
<input type="password" class="form-control" id="create-user-password" placeholder="Password" />
</div>
<div class="form-group">
<label for="group-name">Password Confirm</label>
<input type="password" class="form-control" id="create-user-password-again" placeholder="Password" />
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" id="create-modal-go">Create</button>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

21
src/views/admin/partials/create_user_modal.tpl
Unescape Escape View File

@ -0,0 +1,21 @@
<div class="alert alert-danger hide" id="create-modal-error"></div>
<form>
<div class="form-group">
<label for="group-name">User Name</label>
<input type="text" class="form-control" id="create-user-name" placeholder="User Name" />
</div>
<div class="form-group">
<label for="group-name">Email</label>
<input type="text" class="form-control" id="create-user-email" placeholder="Email of this user" />
</div>
<div class="form-group">
<label for="group-name">Password</label>
<input type="password" class="form-control" id="create-user-password" placeholder="Password" />
</div>
<div class="form-group">
<label for="group-name">Password Confirm</label>
<input type="password" class="form-control" id="create-user-password-again" placeholder="Password" />
</div>
</form>
Write Preview
Loading…
Cancel
Save