Commit 706dfff3 authored by Serge S. Koval's avatar Serge S. Koval

Merge branch 'master' of github.com:flask-admin/flask-admin

parents 3c6b7a87 390d2970
...@@ -9,7 +9,7 @@ msgid "" ...@@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Flask-Admin VERSION\n" "Project-Id-Version: Flask-Admin VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-05-04 08:03-0500\n" "POT-Creation-Date: 2015-06-28 18:28-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -18,7 +18,7 @@ msgstr "" ...@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
#: ../flask_admin/base.py:427 #: ../flask_admin/base.py:431
msgid "Home" msgid "Home"
msgstr "" msgstr ""
...@@ -155,10 +155,10 @@ msgid "Cannot edit %(name)s." ...@@ -155,10 +155,10 @@ msgid "Cannot edit %(name)s."
msgstr "" msgstr ""
#: ../flask_admin/contrib/fileadmin.py:881 #: ../flask_admin/contrib/fileadmin.py:881
#: ../flask_admin/contrib/mongoengine/view.py:626 #: ../flask_admin/contrib/mongoengine/view.py:630
#: ../flask_admin/contrib/peewee/view.py:429 #: ../flask_admin/contrib/peewee/view.py:432
#: ../flask_admin/contrib/pymongo/view.py:349 #: ../flask_admin/contrib/pymongo/view.py:352
#: ../flask_admin/contrib/sqla/view.py:956 #: ../flask_admin/contrib/sqla/view.py:1056
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
...@@ -185,60 +185,60 @@ msgstr "" ...@@ -185,60 +185,60 @@ msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:38 #: ../flask_admin/contrib/mongoengine/filters.py:38
#: ../flask_admin/contrib/peewee/filters.py:38 #: ../flask_admin/contrib/peewee/filters.py:38
#: ../flask_admin/contrib/pymongo/filters.py:38 #: ../flask_admin/contrib/pymongo/filters.py:38
#: ../flask_admin/contrib/sqla/filters.py:38 #: ../flask_admin/contrib/sqla/filters.py:41
msgid "equals" msgid "equals"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:47 #: ../flask_admin/contrib/mongoengine/filters.py:47
#: ../flask_admin/contrib/peewee/filters.py:46 #: ../flask_admin/contrib/peewee/filters.py:46
#: ../flask_admin/contrib/pymongo/filters.py:47 #: ../flask_admin/contrib/pymongo/filters.py:47
#: ../flask_admin/contrib/sqla/filters.py:46 #: ../flask_admin/contrib/sqla/filters.py:49
msgid "not equal" msgid "not equal"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:57 #: ../flask_admin/contrib/mongoengine/filters.py:57
#: ../flask_admin/contrib/peewee/filters.py:55 #: ../flask_admin/contrib/peewee/filters.py:55
#: ../flask_admin/contrib/pymongo/filters.py:57 #: ../flask_admin/contrib/pymongo/filters.py:57
#: ../flask_admin/contrib/sqla/filters.py:55 #: ../flask_admin/contrib/sqla/filters.py:58
msgid "contains" msgid "contains"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:67 #: ../flask_admin/contrib/mongoengine/filters.py:67
#: ../flask_admin/contrib/peewee/filters.py:64 #: ../flask_admin/contrib/peewee/filters.py:64
#: ../flask_admin/contrib/pymongo/filters.py:67 #: ../flask_admin/contrib/pymongo/filters.py:67
#: ../flask_admin/contrib/sqla/filters.py:64 #: ../flask_admin/contrib/sqla/filters.py:67
msgid "not contains" msgid "not contains"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:76 #: ../flask_admin/contrib/mongoengine/filters.py:76
#: ../flask_admin/contrib/peewee/filters.py:72 #: ../flask_admin/contrib/peewee/filters.py:72
#: ../flask_admin/contrib/pymongo/filters.py:80 #: ../flask_admin/contrib/pymongo/filters.py:80
#: ../flask_admin/contrib/sqla/filters.py:72 #: ../flask_admin/contrib/sqla/filters.py:75
msgid "greater than" msgid "greater than"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:85 #: ../flask_admin/contrib/mongoengine/filters.py:85
#: ../flask_admin/contrib/peewee/filters.py:80 #: ../flask_admin/contrib/peewee/filters.py:80
#: ../flask_admin/contrib/pymongo/filters.py:93 #: ../flask_admin/contrib/pymongo/filters.py:93
#: ../flask_admin/contrib/sqla/filters.py:80 #: ../flask_admin/contrib/sqla/filters.py:83
msgid "smaller than" msgid "smaller than"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:97 #: ../flask_admin/contrib/mongoengine/filters.py:97
#: ../flask_admin/contrib/peewee/filters.py:91 #: ../flask_admin/contrib/peewee/filters.py:91
#: ../flask_admin/contrib/sqla/filters.py:91 #: ../flask_admin/contrib/sqla/filters.py:94
msgid "empty" msgid "empty"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:112 #: ../flask_admin/contrib/mongoengine/filters.py:112
#: ../flask_admin/contrib/peewee/filters.py:105 #: ../flask_admin/contrib/peewee/filters.py:105
#: ../flask_admin/contrib/sqla/filters.py:105 #: ../flask_admin/contrib/sqla/filters.py:108
msgid "in list" msgid "in list"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/filters.py:121 #: ../flask_admin/contrib/mongoengine/filters.py:121
#: ../flask_admin/contrib/peewee/filters.py:114 #: ../flask_admin/contrib/peewee/filters.py:114
#: ../flask_admin/contrib/sqla/filters.py:114 #: ../flask_admin/contrib/sqla/filters.py:118
msgid "not in list" msgid "not in list"
msgstr "" msgstr ""
...@@ -246,9 +246,9 @@ msgstr "" ...@@ -246,9 +246,9 @@ msgstr ""
#: ../flask_admin/contrib/peewee/filters.py:208 #: ../flask_admin/contrib/peewee/filters.py:208
#: ../flask_admin/contrib/peewee/filters.py:245 #: ../flask_admin/contrib/peewee/filters.py:245
#: ../flask_admin/contrib/peewee/filters.py:282 #: ../flask_admin/contrib/peewee/filters.py:282
#: ../flask_admin/contrib/sqla/filters.py:209 #: ../flask_admin/contrib/sqla/filters.py:213
#: ../flask_admin/contrib/sqla/filters.py:246 #: ../flask_admin/contrib/sqla/filters.py:250
#: ../flask_admin/contrib/sqla/filters.py:283 #: ../flask_admin/contrib/sqla/filters.py:287
msgid "not between" msgid "not between"
msgstr "" msgstr ""
...@@ -260,7 +260,7 @@ msgstr "" ...@@ -260,7 +260,7 @@ msgstr ""
#: ../flask_admin/contrib/mongoengine/view.py:539 #: ../flask_admin/contrib/mongoengine/view.py:539
#: ../flask_admin/contrib/peewee/view.py:380 #: ../flask_admin/contrib/peewee/view.py:380
#: ../flask_admin/contrib/pymongo/view.py:284 #: ../flask_admin/contrib/pymongo/view.py:284
#: ../flask_admin/contrib/sqla/view.py:888 #: ../flask_admin/contrib/sqla/view.py:985
#, python-format #, python-format
msgid "Failed to create record. %(error)s" msgid "Failed to create record. %(error)s"
msgstr "" msgstr ""
...@@ -268,41 +268,41 @@ msgstr "" ...@@ -268,41 +268,41 @@ msgstr ""
#: ../flask_admin/contrib/mongoengine/view.py:565 #: ../flask_admin/contrib/mongoengine/view.py:565
#: ../flask_admin/contrib/peewee/view.py:399 #: ../flask_admin/contrib/peewee/view.py:399
#: ../flask_admin/contrib/pymongo/view.py:309 #: ../flask_admin/contrib/pymongo/view.py:309
#: ../flask_admin/contrib/sqla/view.py:914 ../flask_admin/model/base.py:1671 #: ../flask_admin/contrib/sqla/view.py:1011 ../flask_admin/model/base.py:1727
#: ../flask_admin/model/base.py:1680 #: ../flask_admin/model/base.py:1736
#, python-format #, python-format
msgid "Failed to update record. %(error)s" msgid "Failed to update record. %(error)s"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/view.py:589 #: ../flask_admin/contrib/mongoengine/view.py:588
#: ../flask_admin/contrib/peewee/view.py:415 #: ../flask_admin/contrib/peewee/view.py:414
#: ../flask_admin/contrib/pymongo/view.py:335 #: ../flask_admin/contrib/pymongo/view.py:334
#: ../flask_admin/contrib/sqla/view.py:940 #: ../flask_admin/contrib/sqla/view.py:1036
#, python-format #, python-format
msgid "Failed to delete record. %(error)s" msgid "Failed to delete record. %(error)s"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/view.py:627 #: ../flask_admin/contrib/mongoengine/view.py:631
#: ../flask_admin/contrib/peewee/view.py:430 #: ../flask_admin/contrib/peewee/view.py:433
#: ../flask_admin/contrib/pymongo/view.py:350 #: ../flask_admin/contrib/pymongo/view.py:353
#: ../flask_admin/contrib/sqla/view.py:957 #: ../flask_admin/contrib/sqla/view.py:1057
msgid "Are you sure you want to delete selected records?" msgid "Are you sure you want to delete selected records?"
msgstr "" msgstr ""
#: ../flask_admin/contrib/mongoengine/view.py:636 #: ../flask_admin/contrib/mongoengine/view.py:640
#: ../flask_admin/contrib/peewee/view.py:446 #: ../flask_admin/contrib/peewee/view.py:450
#: ../flask_admin/contrib/pymongo/view.py:360 #: ../flask_admin/contrib/pymongo/view.py:363
#: ../flask_admin/contrib/sqla/view.py:973 ../flask_admin/model/base.py:1619 #: ../flask_admin/contrib/sqla/view.py:1073 ../flask_admin/model/base.py:1675
#, python-format #, python-format
msgid "Record was successfully deleted." msgid "Record was successfully deleted."
msgid_plural "%(count)s records were successfully deleted." msgid_plural "%(count)s records were successfully deleted."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../flask_admin/contrib/mongoengine/view.py:642 #: ../flask_admin/contrib/mongoengine/view.py:646
#: ../flask_admin/contrib/peewee/view.py:452 #: ../flask_admin/contrib/peewee/view.py:456
#: ../flask_admin/contrib/pymongo/view.py:365 #: ../flask_admin/contrib/pymongo/view.py:368
#: ../flask_admin/contrib/sqla/view.py:981 #: ../flask_admin/contrib/sqla/view.py:1081
#, python-format #, python-format
msgid "Failed to delete records. %(error)s" msgid "Failed to delete records. %(error)s"
msgstr "" msgstr ""
...@@ -325,7 +325,7 @@ msgid_plural "At least %d items are required" ...@@ -325,7 +325,7 @@ msgid_plural "At least %d items are required"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../flask_admin/contrib/sqla/view.py:867 #: ../flask_admin/contrib/sqla/view.py:964
#, python-format #, python-format
msgid "Integrity error. %(message)s" msgid "Integrity error. %(message)s"
msgstr "" msgstr ""
...@@ -338,24 +338,29 @@ msgstr "" ...@@ -338,24 +338,29 @@ msgstr ""
msgid "Invalid Choice: could not coerce" msgid "Invalid Choice: could not coerce"
msgstr "" msgstr ""
#: ../flask_admin/form/upload.py:189 #: ../flask_admin/form/upload.py:205
msgid "Invalid file extension" msgid "Invalid file extension"
msgstr "" msgstr ""
#: ../flask_admin/model/base.py:1281 #: ../flask_admin/form/upload.py:210 ../flask_admin/form/upload.py:277
#, python-format
msgid "File \"%s\" already exists."
msgstr ""
#: ../flask_admin/model/base.py:1325
msgid "There are no items in the table." msgid "There are no items in the table."
msgstr "" msgstr ""
#: ../flask_admin/model/base.py:1305 #: ../flask_admin/model/base.py:1349
#, python-format #, python-format
msgid "Invalid Filter Value: %(value)s" msgid "Invalid Filter Value: %(value)s"
msgstr "" msgstr ""
#: ../flask_admin/model/base.py:1539 #: ../flask_admin/model/base.py:1590
msgid "Record was successfully created." msgid "Record was successfully created."
msgstr "" msgstr ""
#: ../flask_admin/model/base.py:1578 ../flask_admin/model/base.py:1676 #: ../flask_admin/model/base.py:1634 ../flask_admin/model/base.py:1732
msgid "Record was successfully saved." msgid "Record was successfully saved."
msgstr "" msgstr ""
...@@ -377,13 +382,13 @@ msgstr "" ...@@ -377,13 +382,13 @@ msgstr ""
msgid "With selected" msgid "With selected"
msgstr "" msgstr ""
#: ../flask_admin/templates/bootstrap2/admin/lib.html:156 #: ../flask_admin/templates/bootstrap2/admin/lib.html:181
#: ../flask_admin/templates/bootstrap3/admin/lib.html:150 #: ../flask_admin/templates/bootstrap3/admin/lib.html:173
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: ../flask_admin/templates/bootstrap2/admin/lib.html:161 #: ../flask_admin/templates/bootstrap2/admin/lib.html:186
#: ../flask_admin/templates/bootstrap3/admin/lib.html:155 #: ../flask_admin/templates/bootstrap3/admin/lib.html:178
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
...@@ -520,17 +525,17 @@ msgstr "" ...@@ -520,17 +525,17 @@ msgstr ""
msgid "Edit record" msgid "Edit record"
msgstr "" msgstr ""
#: ../flask_admin/templates/bootstrap2/admin/model/list.html:114 #: ../flask_admin/templates/bootstrap2/admin/model/list.html:118
#: ../flask_admin/templates/bootstrap3/admin/model/list.html:114 #: ../flask_admin/templates/bootstrap3/admin/model/list.html:118
msgid "Are you sure you want to delete this record?" msgid "Are you sure you want to delete this record?"
msgstr "" msgstr ""
#: ../flask_admin/templates/bootstrap2/admin/model/list.html:114 #: ../flask_admin/templates/bootstrap2/admin/model/list.html:118
msgid "Delete record" msgid "Delete record"
msgstr "" msgstr ""
#: ../flask_admin/templates/bootstrap2/admin/model/list.html:161 #: ../flask_admin/templates/bootstrap2/admin/model/list.html:171
#: ../flask_admin/templates/bootstrap3/admin/model/list.html:160 #: ../flask_admin/templates/bootstrap3/admin/model/list.html:170
msgid "Please select at least one record." msgid "Please select at least one record."
msgstr "" msgstr ""
/*! /*!
* Bootstrap Responsive v2.3.1 * Bootstrap Responsive v2.3.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world by @mdo and @fat.
*/ */
.clearfix { .clearfix {
......
/*! /*!
* Bootstrap v2.3.1 * Bootstrap v2.3.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world by @mdo and @fat.
*/ */
.clearfix { .clearfix {
...@@ -3009,6 +3009,15 @@ table th[class*="span"], ...@@ -3009,6 +3009,15 @@ table th[class*="span"],
display: block; display: block;
} }
.dropdown-backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 990;
}
.pull-right > .dropdown-menu { .pull-right > .dropdown-menu {
right: 0; right: 0;
left: auto; left: auto;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.3.1 * bootstrap-transition.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://getbootstrap.com/2.3.2/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
}) })
}(window.jQuery);/* ========================================================== }(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.3.1 * bootstrap-alert.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://getbootstrap.com/2.3.2/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -156,10 +156,10 @@ ...@@ -156,10 +156,10 @@
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close) $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);/* ============================================================ }(window.jQuery);/* ============================================================
* bootstrap-button.js v2.3.1 * bootstrap-button.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://getbootstrap.com/2.3.2/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -260,10 +260,10 @@ ...@@ -260,10 +260,10 @@
}) })
}(window.jQuery);/* ========================================================== }(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.3.1 * bootstrap-carousel.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://getbootstrap.com/2.3.2/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -466,10 +466,10 @@ ...@@ -466,10 +466,10 @@
}) })
}(window.jQuery);/* ============================================================= }(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.3.1 * bootstrap-collapse.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://getbootstrap.com/2.3.2/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -632,10 +632,10 @@ ...@@ -632,10 +632,10 @@
}) })
}(window.jQuery);/* ============================================================ }(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.3.1 * bootstrap-dropdown.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://getbootstrap.com/2.3.2/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -685,6 +685,10 @@ ...@@ -685,6 +685,10 @@
clearMenus() clearMenus()
if (!isActive) { if (!isActive) {
if ('ontouchstart' in document.documentElement) {
// if mobile we we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
}
$parent.toggleClass('open') $parent.toggleClass('open')
} }
...@@ -737,6 +741,7 @@ ...@@ -737,6 +741,7 @@
} }
function clearMenus() { function clearMenus() {
$('.dropdown-backdrop').remove()
$(toggle).each(function () { $(toggle).each(function () {
getParent($(this)).removeClass('open') getParent($(this)).removeClass('open')
}) })
...@@ -791,16 +796,15 @@ ...@@ -791,16 +796,15 @@
$(document) $(document)
.on('click.dropdown.data-api', clearMenus) .on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery); }(window.jQuery);
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.3.1 * bootstrap-modal.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#modals * http://getbootstrap.com/2.3.2/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -1044,11 +1048,11 @@ ...@@ -1044,11 +1048,11 @@
}(window.jQuery); }(window.jQuery);
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.3.1 * bootstrap-tooltip.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://getbootstrap.com/2.3.2/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -1405,10 +1409,10 @@ ...@@ -1405,10 +1409,10 @@
}(window.jQuery); }(window.jQuery);
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.3.1 * bootstrap-popover.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://getbootstrap.com/2.3.2/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -1519,10 +1523,10 @@ ...@@ -1519,10 +1523,10 @@
}(window.jQuery); }(window.jQuery);
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js v2.3.1 * bootstrap-scrollspy.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://getbootstrap.com/2.3.2/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -1680,10 +1684,10 @@ ...@@ -1680,10 +1684,10 @@
}) })
}(window.jQuery);/* ======================================================== }(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.3.1 * bootstrap-tab.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://getbootstrap.com/2.3.2/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -1823,10 +1827,10 @@ ...@@ -1823,10 +1827,10 @@
}) })
}(window.jQuery);/* ============================================================= }(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.3.1 * bootstrap-typeahead.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead * http://getbootstrap.com/2.3.2/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -2158,10 +2162,10 @@ ...@@ -2158,10 +2162,10 @@
}(window.jQuery); }(window.jQuery);
/* ========================================================== /* ==========================================================
* bootstrap-affix.js v2.3.1 * bootstrap-affix.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#affix * http://getbootstrap.com/2.3.2/javascript.html#affix
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/*! /*!
* Bootstrap v3.3.1 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
.btn-default, .btn-default,
.btn-primary, .btn-primary,
.btn-success, .btn-success,
...@@ -29,6 +28,27 @@ ...@@ -29,6 +28,27 @@
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
} }
.btn-default.disabled,
.btn-primary.disabled,
.btn-success.disabled,
.btn-info.disabled,
.btn-warning.disabled,
.btn-danger.disabled,
.btn-default[disabled],
.btn-primary[disabled],
.btn-success[disabled],
.btn-info[disabled],
.btn-warning[disabled],
.btn-danger[disabled],
fieldset[disabled] .btn-default,
fieldset[disabled] .btn-primary,
fieldset[disabled] .btn-success,
fieldset[disabled] .btn-info,
fieldset[disabled] .btn-warning,
fieldset[disabled] .btn-danger {
-webkit-box-shadow: none;
box-shadow: none;
}
.btn-default .badge, .btn-default .badge,
.btn-primary .badge, .btn-primary .badge,
.btn-success .badge, .btn-success .badge,
...@@ -63,8 +83,24 @@ ...@@ -63,8 +83,24 @@
background-color: #e0e0e0; background-color: #e0e0e0;
border-color: #dbdbdb; border-color: #dbdbdb;
} }
.btn-default:disabled, .btn-default.disabled,
.btn-default[disabled] { .btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover,
.btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover,
.btn-default.disabled:focus,
.btn-default[disabled]:focus,
fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus,
.btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #e0e0e0; background-color: #e0e0e0;
background-image: none; background-image: none;
} }
...@@ -88,8 +124,24 @@ ...@@ -88,8 +124,24 @@
background-color: #265a88; background-color: #265a88;
border-color: #245580; border-color: #245580;
} }
.btn-primary:disabled, .btn-primary.disabled,
.btn-primary[disabled] { .btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #265a88; background-color: #265a88;
background-image: none; background-image: none;
} }
...@@ -113,8 +165,24 @@ ...@@ -113,8 +165,24 @@
background-color: #419641; background-color: #419641;
border-color: #3e8f3e; border-color: #3e8f3e;
} }
.btn-success:disabled, .btn-success.disabled,
.btn-success[disabled] { .btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #419641; background-color: #419641;
background-image: none; background-image: none;
} }
...@@ -138,8 +206,24 @@ ...@@ -138,8 +206,24 @@
background-color: #2aabd2; background-color: #2aabd2;
border-color: #28a4c9; border-color: #28a4c9;
} }
.btn-info:disabled, .btn-info.disabled,
.btn-info[disabled] { .btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #2aabd2; background-color: #2aabd2;
background-image: none; background-image: none;
} }
...@@ -163,8 +247,24 @@ ...@@ -163,8 +247,24 @@
background-color: #eb9316; background-color: #eb9316;
border-color: #e38d13; border-color: #e38d13;
} }
.btn-warning:disabled, .btn-warning.disabled,
.btn-warning[disabled] { .btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #eb9316; background-color: #eb9316;
background-image: none; background-image: none;
} }
...@@ -188,8 +288,24 @@ ...@@ -188,8 +288,24 @@
background-color: #c12e2a; background-color: #c12e2a;
border-color: #b92c28; border-color: #b92c28;
} }
.btn-danger:disabled, .btn-danger.disabled,
.btn-danger[disabled] { .btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
...@@ -254,6 +370,7 @@ ...@@ -254,6 +370,7 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x; background-repeat: repeat-x;
border-radius: 4px;
} }
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .active > a { .navbar-inverse .navbar-nav > .active > a {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
/*! /*!
* Stylesheet for the Date Range Picker, for use with Bootstrap 2.x * Stylesheet for the Date Range Picker, for use with Bootstrap 2.x
* *
* Copyright 2013 Dan Grossman ( http://www.dangrossman.info ) * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
* Licensed under the Apache License v2.0 * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
* http://www.apache.org/licenses/LICENSE-2.0
* *
* Built for http://www.improvely.com * Built for http://www.improvely.com
*/ */
...@@ -195,6 +194,22 @@ ...@@ -195,6 +194,22 @@
content: ''; content: '';
} }
.daterangepicker.dropup{
margin-top: -5px;
}
.daterangepicker.dropup:before{
top: initial;
bottom:-7px;
border-bottom: initial;
border-top: 7px solid #ccc;
}
.daterangepicker.dropup:after{
top: initial;
bottom:-6px;
border-bottom: initial;
border-top: 6px solid #fff;
}
.daterangepicker table { .daterangepicker table {
width: 100%; width: 100%;
margin: 0; margin: 0;
...@@ -219,7 +234,7 @@ ...@@ -219,7 +234,7 @@
color: #999; color: #999;
} }
.daterangepicker td.available:hover, .daterangepicker th.available:hover { .daterangepicker td.available:hover, .daterangepicker td.available.today, .daterangepicker th.available:hover {
background: #eee; background: #eee;
} }
...@@ -230,7 +245,7 @@ ...@@ -230,7 +245,7 @@
border-radius: 0; border-radius: 0;
} }
.daterangepicker td.active, .daterangepicker td.active:hover { .daterangepicker td.today.active, .daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #006dcc; background-color: #006dcc;
background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -ms-linear-gradient(top, #0088cc, #0044cc); background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
...@@ -269,7 +284,7 @@ ...@@ -269,7 +284,7 @@
width: 40%; width: 40%;
} }
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect { .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
width: 60px; width: 60px;
margin-bottom: 0; margin-bottom: 0;
} }
......
/*! /*!
* Stylesheet for the Date Range Picker, for use with Bootstrap 3.x * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
* *
* Copyright 2013 Dan Grossman ( http://www.dangrossman.info ) * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
* Licensed under the Apache License v2.0 * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
* http://www.apache.org/licenses/LICENSE-2.0
* *
* Built for http://www.improvely.com * Built for http://www.improvely.com
*/ */
...@@ -220,6 +219,22 @@ ...@@ -220,6 +219,22 @@
content: ''; content: '';
} }
.daterangepicker.dropup{
margin-top: -5px;
}
.daterangepicker.dropup:before{
top: initial;
bottom:-7px;
border-bottom: initial;
border-top: 7px solid #ccc;
}
.daterangepicker.dropup:after{
top: initial;
bottom:-6px;
border-bottom: initial;
border-top: 6px solid #fff;
}
.daterangepicker table { .daterangepicker table {
width: 100%; width: 100%;
margin: 0; margin: 0;
...@@ -244,7 +259,7 @@ ...@@ -244,7 +259,7 @@
color: #999; color: #999;
} }
.daterangepicker td.available:hover, .daterangepicker th.available:hover { .daterangepicker td.available:hover, .daterangepicker td.available.today, .daterangepicker th.available:hover {
background: #eee; background: #eee;
} }
...@@ -273,7 +288,7 @@ ...@@ -273,7 +288,7 @@
border-radius: 4px; border-radius: 4px;
} }
.daterangepicker td.active, .daterangepicker td.active:hover { .daterangepicker td.today.active, .daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #357ebd; background-color: #357ebd;
border-color: #3071a9; border-color: #3071a9;
color: #fff; color: #fff;
...@@ -301,7 +316,7 @@ ...@@ -301,7 +316,7 @@
width: 40%; width: 40%;
} }
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect { .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
width: 50px; width: 50px;
margin-bottom: 0; margin-bottom: 0;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -3,7 +3,7 @@ msgstr "" ...@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: flask-admin\n" "Project-Id-Version: flask-admin\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-05-02 18:11-0500\n" "POT-Creation-Date: 2015-05-02 18:11-0500\n"
"PO-Revision-Date: 2015-05-03 17:47-0400\n" "PO-Revision-Date: 2015-06-28 19:28-0400\n"
"Last-Translator: mrjoes <serge.koval@gmail.com>\n" "Last-Translator: mrjoes <serge.koval@gmail.com>\n"
"Language-Team: Japanese\n" "Language-Team: Japanese\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment