diff -Nru django-guardian-1.1.1/AUTHORS django-guardian-1.2.0/AUTHORS --- django-guardian-1.1.1/AUTHORS 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/AUTHORS 2014-07-22 09:46:49.000000000 +0000 @@ -21,3 +21,18 @@ - Adrián López - Jameel Al-Aziz - John P. Neumann +- Andreas Madsack +- Ivan Kharlamov +- Miguel de Val-Borro +- Jan Nakladal +- Yonel Ceruto +- Luke Faraone +- John Wegis +- Florentin Sardan +- Geoff Greer +- Hans Larsen +- Fabio C. Barrionuevo da Luz @luzfcb +- Tomasz Wsuł <2nickers@gmail.com> +- Xavier Ordoquy +- Joshua Bonnett +- Jernej Kos diff -Nru django-guardian-1.1.1/CHANGES django-guardian-1.2.0/CHANGES --- django-guardian-1.1.1/CHANGES 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/CHANGES 2014-07-22 09:46:49.000000000 +0000 @@ -1,3 +1,33 @@ +Release 1.2 (Mar 7, 2014) +========================= + +* Removed ``get_for_object`` methods from managers (#188) +* Extended documentation +* GuardedModelAdmin has been splitted into mixins +* Faster queries in get_objects_for_user when use_groups=False or any_perm=True + (#148) +* Improved speed of get_objects_for_user shortcut +* Support for custom User model with not default username field +* Added GUARDIAN_GET_INIT_ANONYMOUS_USER setting (#179) +* Added ``accept_global_perms`` to ``PermissionRequiredMixin`` +* Added brazilian portuguese translations +* Added polish translations +* Added ``wheel`` support +* Fixed wrong anonymous user checks +* Support for Django 1.6 +* Support for Django 1.7 alpha + +.. important:: + In this release we have removed undocumented ``get_for_object`` method + from both ``UserObjectPermissionManager`` and + ``GroupObjectPermissionManager``. Not deprecated, removed. Those methods + were not used within ``django-guardian`` and their odd names could lead to + issues if user would believe they would return object level permissions + associated with user/group and object passed as the input. If you depend + on those methods, you'd need to stick with version 1.1 and make sure you + do not misuse them. + + Release 1.1 (May 26, 2013) ========================== diff -Nru django-guardian-1.1.1/debian/changelog django-guardian-1.2.0/debian/changelog --- django-guardian-1.1.1/debian/changelog 2014-01-30 10:36:50.000000000 +0000 +++ django-guardian-1.2.0/debian/changelog 2014-07-22 09:47:38.000000000 +0000 @@ -1,20 +1,5 @@ -django-guardian (1.1.1-2) unstable; urgency=medium +django-guardian (1.2.0-1) trusty; urgency=high - * Fixed: Installs benchmarks and example_project python packages - (Closes: #737002) - - Thanks to report Michael Fladischer . - * debian/control: - - Update Standards-Version to 3.9.5. - - Append quilt to Build-Depends. - * Change to DEP3 style header - - debian/patches/append_uncompressed_js_libraries.patch + * source package automatically created by stdeb 0.6.0+git - -- Kouhei Maeda Thu, 30 Jan 2014 19:36:25 +0900 - -django-guardian (1.1.1-1) unstable; urgency=low - - * Initial release (Closes: #724989) - * debian/patches: - - append_uncompressed_js_libraries.patch - - -- Kouhei Maeda Mon, 30 Sep 2013 18:03:37 +0900 + -- Lukasz Balcerzak Tue, 22 Jul 2014 09:46:56 +0000 diff -Nru django-guardian-1.1.1/debian/compat django-guardian-1.2.0/debian/compat --- django-guardian-1.1.1/debian/compat 2013-09-27 10:04:24.000000000 +0000 +++ django-guardian-1.2.0/debian/compat 2014-07-22 09:46:56.000000000 +0000 @@ -1 +1 @@ -8 +7 diff -Nru django-guardian-1.1.1/debian/control django-guardian-1.2.0/debian/control --- django-guardian-1.1.1/debian/control 2014-01-29 23:25:29.000000000 +0000 +++ django-guardian-1.2.0/debian/control 2014-07-22 09:46:56.000000000 +0000 @@ -1,40 +1,31 @@ Source: django-guardian +Maintainer: Lukasz Balcerzak Section: python Priority: optional -Maintainer: Kouhei Maeda -Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-django (>= 1.2), python-sphinx, python-mock (>= 0.7.2), quilt -Standards-Version: 3.9.5 -X-Python-Version: >= 2.6 -Homepage: http://github.com/lukaszb/django-guardian +Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7) +Standards-Version: 3.9.1 Package: python-django-guardian Architecture: all -Provides: ${python:Provides} -Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.2) -Suggests: python-django-guardian-doc -Description: per object permissions of django - Implementation of per object permissions as authorization backend which is - supported since Django 1.2. It provides features as followings; - - Object permissions for Django_ - - AnonymousUser support - - High level API - - Heavely tested - - Django's admin integration - - Decorators - -Package: python-django-guardian-doc -Section: doc -Architecture: all -Depends: ${misc:Depends}, libjs-underscore, python-sphinx, sphinx-common -Description: per object permissions of django (documentation) - Implementation of per object permissions as authorization backend which is - supported since Django 1.2. It provides features as followings; - - Object permissions for Django_ - - AnonymousUser support - - High level API - - Heavely tested - - Django's admin integration - - Decorators +Depends: ${misc:Depends}, ${python:Depends} +Description: Implementation of per object permissions for Django 1.2 or l + =============== + django-guardian + =============== . - This package contains the HTML documentation. - + .. image:: https://secure.travis-ci.org/lukaszb/django-guardian.png?branch=master + :target: http://travis-ci.org/lukaszb/django-guardian + . + .. image:: https://coveralls.io/repos/lukaszb/django-guardian/badge.png?branch=master + :target: https://coveralls.io/r/lukaszb/django-guardian/ + . + .. image:: https://pypip.in/v/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + . + .. image:: https://pypip.in/d/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + . + . + ``django-guardian`` is implementation of per object permissions [1]_ as + authorization backend which is supported since Django_ 1.2. It won't + work with older Django_ releases. diff -Nru django-guardian-1.1.1/debian/copyright django-guardian-1.2.0/debian/copyright --- django-guardian-1.1.1/debian/copyright 2013-09-30 06:47:06.000000000 +0000 +++ django-guardian-1.2.0/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: django-guardian -Source: https://pypi.python.org/pypi/django-guardian - -Files: * -Copyright: 2010-2013 Lukasz Balcerzak -License: BSD-2-Clause - -Files: docs/theme/ADCtheme/* -Copyright: 2009 Corey Oordt -License: BSD-3-Clause - -Files: example_project/static/js/bootstrap.min.js - example_project/static/css/bootstrap.min.css -Copyright: 2012 Twitter, Inc. -License: Apache-2.0 - -Files: debian/* -Copyright: 2013 Kouhei Maeda -License: BSD-2-Clause - -License: BSD-2-Clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: BSD-3-Clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: Apache-2.0 - 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. - . - On Debian-based systems the full text of the Apache version 2.0 license can be - found in /usr/share/common-licenses/Apache-2.0. - diff -Nru django-guardian-1.1.1/debian/docs django-guardian-1.2.0/debian/docs --- django-guardian-1.1.1/debian/docs 2013-09-27 14:34:52.000000000 +0000 +++ django-guardian-1.2.0/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -README.rst -AUTHORS diff -Nru django-guardian-1.1.1/debian/patches/Append-to-sys_path_to_conf_py.patch django-guardian-1.2.0/debian/patches/Append-to-sys_path_to_conf_py.patch --- django-guardian-1.1.1/debian/patches/Append-to-sys_path_to_conf_py.patch 2014-01-29 23:34:03.000000000 +0000 +++ django-guardian-1.2.0/debian/patches/Append-to-sys_path_to_conf_py.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: django-guardian-1.1.1/docs/conf.py -=================================================================== ---- django-guardian-1.1.1.orig/docs/conf.py 2014-01-30 08:27:34.003702790 +0900 -+++ django-guardian-1.1.1/docs/conf.py 2014-01-30 08:27:33.999702965 +0900 -@@ -17,6 +17,7 @@ - # add these directories to sys.path here. If the directory is relative to the - # documentation root, use os.path.abspath to make it absolute, like shown here. - sys.path.insert(0, os.path.abspath('..')) -+print sys.path - sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__)))) - os.environ['DJANGO_SETTINGS_MODULE'] = 'guardian.testsettings' - ANONYMOUS_USER_ID = -1 # Required by guardian diff -Nru django-guardian-1.1.1/debian/patches/append_uncompressed_js_libraries.patch django-guardian-1.2.0/debian/patches/append_uncompressed_js_libraries.patch --- django-guardian-1.1.1/debian/patches/append_uncompressed_js_libraries.patch 2014-01-29 23:39:47.000000000 +0000 +++ django-guardian-1.2.0/debian/patches/append_uncompressed_js_libraries.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,8445 +0,0 @@ -Description: Append uncompressed JavaScript libraries - Append uncompressed JavaScript libraries as following. - - Twitter Bootstrap - - example_project/static/js/bootstrap.js - - example_project/static/css/bootstrap.css -Author: Twitter, Inc -Origin: https://github.com/twbs/bootstrap/archive/v2.3.0.tar.gz -Last-Update: 2013-02-07 -Index: django-guardian-1.1.1/example_project/static/css/bootstrap.css -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ django-guardian-1.1.1/example_project/static/css/bootstrap.css 2013-09-30 17:07:20.082253261 +0900 -@@ -0,0 +1,6158 @@ -+/*! -+ * Bootstrap v2.3.0 -+ * -+ * Copyright 2012 Twitter, Inc -+ * Licensed under the Apache License v2.0 -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Designed and built with all the love in the world @twitter by @mdo and @fat. -+ */ -+ -+.clearfix { -+ *zoom: 1; -+} -+ -+.clearfix:before, -+.clearfix:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.clearfix:after { -+ clear: both; -+} -+ -+.hide-text { -+ font: 0/0 a; -+ color: transparent; -+ text-shadow: none; -+ background-color: transparent; -+ border: 0; -+} -+ -+.input-block-level { -+ display: block; -+ width: 100%; -+ min-height: 30px; -+ -webkit-box-sizing: border-box; -+ -moz-box-sizing: border-box; -+ box-sizing: border-box; -+} -+ -+article, -+aside, -+details, -+figcaption, -+figure, -+footer, -+header, -+hgroup, -+nav, -+section { -+ display: block; -+} -+ -+audio, -+canvas, -+video { -+ display: inline-block; -+ *display: inline; -+ *zoom: 1; -+} -+ -+audio:not([controls]) { -+ display: none; -+} -+ -+html { -+ font-size: 100%; -+ -webkit-text-size-adjust: 100%; -+ -ms-text-size-adjust: 100%; -+} -+ -+a:focus { -+ outline: thin dotted #333; -+ outline: 5px auto -webkit-focus-ring-color; -+ outline-offset: -2px; -+} -+ -+a:hover, -+a:active { -+ outline: 0; -+} -+ -+sub, -+sup { -+ position: relative; -+ font-size: 75%; -+ line-height: 0; -+ vertical-align: baseline; -+} -+ -+sup { -+ top: -0.5em; -+} -+ -+sub { -+ bottom: -0.25em; -+} -+ -+img { -+ width: auto\9; -+ height: auto; -+ max-width: 100%; -+ vertical-align: middle; -+ border: 0; -+ -ms-interpolation-mode: bicubic; -+} -+ -+#map_canvas img, -+.google-maps img { -+ max-width: none; -+} -+ -+button, -+input, -+select, -+textarea { -+ margin: 0; -+ font-size: 100%; -+ vertical-align: middle; -+} -+ -+button, -+input { -+ *overflow: visible; -+ line-height: normal; -+} -+ -+button::-moz-focus-inner, -+input::-moz-focus-inner { -+ padding: 0; -+ border: 0; -+} -+ -+button, -+html input[type="button"], -+input[type="reset"], -+input[type="submit"] { -+ cursor: pointer; -+ -webkit-appearance: button; -+} -+ -+label, -+select, -+button, -+input[type="button"], -+input[type="reset"], -+input[type="submit"], -+input[type="radio"], -+input[type="checkbox"] { -+ cursor: pointer; -+} -+ -+input[type="search"] { -+ -webkit-box-sizing: content-box; -+ -moz-box-sizing: content-box; -+ box-sizing: content-box; -+ -webkit-appearance: textfield; -+} -+ -+input[type="search"]::-webkit-search-decoration, -+input[type="search"]::-webkit-search-cancel-button { -+ -webkit-appearance: none; -+} -+ -+textarea { -+ overflow: auto; -+ vertical-align: top; -+} -+ -+@media print { -+ * { -+ color: #000 !important; -+ text-shadow: none !important; -+ background: transparent !important; -+ box-shadow: none !important; -+ } -+ a, -+ a:visited { -+ text-decoration: underline; -+ } -+ a[href]:after { -+ content: " (" attr(href) ")"; -+ } -+ abbr[title]:after { -+ content: " (" attr(title) ")"; -+ } -+ .ir a:after, -+ a[href^="javascript:"]:after, -+ a[href^="#"]:after { -+ content: ""; -+ } -+ pre, -+ blockquote { -+ border: 1px solid #999; -+ page-break-inside: avoid; -+ } -+ thead { -+ display: table-header-group; -+ } -+ tr, -+ img { -+ page-break-inside: avoid; -+ } -+ img { -+ max-width: 100% !important; -+ } -+ @page { -+ margin: 0.5cm; -+ } -+ p, -+ h2, -+ h3 { -+ orphans: 3; -+ widows: 3; -+ } -+ h2, -+ h3 { -+ page-break-after: avoid; -+ } -+} -+ -+body { -+ margin: 0; -+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -+ font-size: 14px; -+ line-height: 20px; -+ color: #333333; -+ background-color: #ffffff; -+} -+ -+a { -+ color: #0088cc; -+ text-decoration: none; -+} -+ -+a:hover, -+a:focus { -+ color: #005580; -+ text-decoration: underline; -+} -+ -+.img-rounded { -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+} -+ -+.img-polaroid { -+ padding: 4px; -+ background-color: #fff; -+ border: 1px solid #ccc; -+ border: 1px solid rgba(0, 0, 0, 0.2); -+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -+} -+ -+.img-circle { -+ -webkit-border-radius: 500px; -+ -moz-border-radius: 500px; -+ border-radius: 500px; -+} -+ -+.row { -+ margin-left: -20px; -+ *zoom: 1; -+} -+ -+.row:before, -+.row:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.row:after { -+ clear: both; -+} -+ -+[class*="span"] { -+ float: left; -+ min-height: 1px; -+ margin-left: 20px; -+} -+ -+.container, -+.navbar-static-top .container, -+.navbar-fixed-top .container, -+.navbar-fixed-bottom .container { -+ width: 940px; -+} -+ -+.span12 { -+ width: 940px; -+} -+ -+.span11 { -+ width: 860px; -+} -+ -+.span10 { -+ width: 780px; -+} -+ -+.span9 { -+ width: 700px; -+} -+ -+.span8 { -+ width: 620px; -+} -+ -+.span7 { -+ width: 540px; -+} -+ -+.span6 { -+ width: 460px; -+} -+ -+.span5 { -+ width: 380px; -+} -+ -+.span4 { -+ width: 300px; -+} -+ -+.span3 { -+ width: 220px; -+} -+ -+.span2 { -+ width: 140px; -+} -+ -+.span1 { -+ width: 60px; -+} -+ -+.offset12 { -+ margin-left: 980px; -+} -+ -+.offset11 { -+ margin-left: 900px; -+} -+ -+.offset10 { -+ margin-left: 820px; -+} -+ -+.offset9 { -+ margin-left: 740px; -+} -+ -+.offset8 { -+ margin-left: 660px; -+} -+ -+.offset7 { -+ margin-left: 580px; -+} -+ -+.offset6 { -+ margin-left: 500px; -+} -+ -+.offset5 { -+ margin-left: 420px; -+} -+ -+.offset4 { -+ margin-left: 340px; -+} -+ -+.offset3 { -+ margin-left: 260px; -+} -+ -+.offset2 { -+ margin-left: 180px; -+} -+ -+.offset1 { -+ margin-left: 100px; -+} -+ -+.row-fluid { -+ width: 100%; -+ *zoom: 1; -+} -+ -+.row-fluid:before, -+.row-fluid:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.row-fluid:after { -+ clear: both; -+} -+ -+.row-fluid [class*="span"] { -+ display: block; -+ float: left; -+ width: 100%; -+ min-height: 30px; -+ margin-left: 2.127659574468085%; -+ *margin-left: 2.074468085106383%; -+ -webkit-box-sizing: border-box; -+ -moz-box-sizing: border-box; -+ box-sizing: border-box; -+} -+ -+.row-fluid [class*="span"]:first-child { -+ margin-left: 0; -+} -+ -+.row-fluid .controls-row [class*="span"] + [class*="span"] { -+ margin-left: 2.127659574468085%; -+} -+ -+.row-fluid .span12 { -+ width: 100%; -+ *width: 99.94680851063829%; -+} -+ -+.row-fluid .span11 { -+ width: 91.48936170212765%; -+ *width: 91.43617021276594%; -+} -+ -+.row-fluid .span10 { -+ width: 82.97872340425532%; -+ *width: 82.92553191489361%; -+} -+ -+.row-fluid .span9 { -+ width: 74.46808510638297%; -+ *width: 74.41489361702126%; -+} -+ -+.row-fluid .span8 { -+ width: 65.95744680851064%; -+ *width: 65.90425531914893%; -+} -+ -+.row-fluid .span7 { -+ width: 57.44680851063829%; -+ *width: 57.39361702127659%; -+} -+ -+.row-fluid .span6 { -+ width: 48.93617021276595%; -+ *width: 48.88297872340425%; -+} -+ -+.row-fluid .span5 { -+ width: 40.42553191489362%; -+ *width: 40.37234042553192%; -+} -+ -+.row-fluid .span4 { -+ width: 31.914893617021278%; -+ *width: 31.861702127659576%; -+} -+ -+.row-fluid .span3 { -+ width: 23.404255319148934%; -+ *width: 23.351063829787233%; -+} -+ -+.row-fluid .span2 { -+ width: 14.893617021276595%; -+ *width: 14.840425531914894%; -+} -+ -+.row-fluid .span1 { -+ width: 6.382978723404255%; -+ *width: 6.329787234042553%; -+} -+ -+.row-fluid .offset12 { -+ margin-left: 104.25531914893617%; -+ *margin-left: 104.14893617021275%; -+} -+ -+.row-fluid .offset12:first-child { -+ margin-left: 102.12765957446808%; -+ *margin-left: 102.02127659574467%; -+} -+ -+.row-fluid .offset11 { -+ margin-left: 95.74468085106382%; -+ *margin-left: 95.6382978723404%; -+} -+ -+.row-fluid .offset11:first-child { -+ margin-left: 93.61702127659574%; -+ *margin-left: 93.51063829787232%; -+} -+ -+.row-fluid .offset10 { -+ margin-left: 87.23404255319149%; -+ *margin-left: 87.12765957446807%; -+} -+ -+.row-fluid .offset10:first-child { -+ margin-left: 85.1063829787234%; -+ *margin-left: 84.99999999999999%; -+} -+ -+.row-fluid .offset9 { -+ margin-left: 78.72340425531914%; -+ *margin-left: 78.61702127659572%; -+} -+ -+.row-fluid .offset9:first-child { -+ margin-left: 76.59574468085106%; -+ *margin-left: 76.48936170212764%; -+} -+ -+.row-fluid .offset8 { -+ margin-left: 70.2127659574468%; -+ *margin-left: 70.10638297872339%; -+} -+ -+.row-fluid .offset8:first-child { -+ margin-left: 68.08510638297872%; -+ *margin-left: 67.9787234042553%; -+} -+ -+.row-fluid .offset7 { -+ margin-left: 61.70212765957446%; -+ *margin-left: 61.59574468085106%; -+} -+ -+.row-fluid .offset7:first-child { -+ margin-left: 59.574468085106375%; -+ *margin-left: 59.46808510638297%; -+} -+ -+.row-fluid .offset6 { -+ margin-left: 53.191489361702125%; -+ *margin-left: 53.085106382978715%; -+} -+ -+.row-fluid .offset6:first-child { -+ margin-left: 51.063829787234035%; -+ *margin-left: 50.95744680851063%; -+} -+ -+.row-fluid .offset5 { -+ margin-left: 44.68085106382979%; -+ *margin-left: 44.57446808510638%; -+} -+ -+.row-fluid .offset5:first-child { -+ margin-left: 42.5531914893617%; -+ *margin-left: 42.4468085106383%; -+} -+ -+.row-fluid .offset4 { -+ margin-left: 36.170212765957444%; -+ *margin-left: 36.06382978723405%; -+} -+ -+.row-fluid .offset4:first-child { -+ margin-left: 34.04255319148936%; -+ *margin-left: 33.93617021276596%; -+} -+ -+.row-fluid .offset3 { -+ margin-left: 27.659574468085104%; -+ *margin-left: 27.5531914893617%; -+} -+ -+.row-fluid .offset3:first-child { -+ margin-left: 25.53191489361702%; -+ *margin-left: 25.425531914893618%; -+} -+ -+.row-fluid .offset2 { -+ margin-left: 19.148936170212764%; -+ *margin-left: 19.04255319148936%; -+} -+ -+.row-fluid .offset2:first-child { -+ margin-left: 17.02127659574468%; -+ *margin-left: 16.914893617021278%; -+} -+ -+.row-fluid .offset1 { -+ margin-left: 10.638297872340425%; -+ *margin-left: 10.53191489361702%; -+} -+ -+.row-fluid .offset1:first-child { -+ margin-left: 8.51063829787234%; -+ *margin-left: 8.404255319148938%; -+} -+ -+[class*="span"].hide, -+.row-fluid [class*="span"].hide { -+ display: none; -+} -+ -+[class*="span"].pull-right, -+.row-fluid [class*="span"].pull-right { -+ float: right; -+} -+ -+.container { -+ margin-right: auto; -+ margin-left: auto; -+ *zoom: 1; -+} -+ -+.container:before, -+.container:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.container:after { -+ clear: both; -+} -+ -+.container-fluid { -+ padding-right: 20px; -+ padding-left: 20px; -+ *zoom: 1; -+} -+ -+.container-fluid:before, -+.container-fluid:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.container-fluid:after { -+ clear: both; -+} -+ -+p { -+ margin: 0 0 10px; -+} -+ -+.lead { -+ margin-bottom: 20px; -+ font-size: 21px; -+ font-weight: 200; -+ line-height: 30px; -+} -+ -+small { -+ font-size: 85%; -+} -+ -+strong { -+ font-weight: bold; -+} -+ -+em { -+ font-style: italic; -+} -+ -+cite { -+ font-style: normal; -+} -+ -+.muted { -+ color: #999999; -+} -+ -+a.muted:hover, -+a.muted:focus { -+ color: #808080; -+} -+ -+.text-warning { -+ color: #c09853; -+} -+ -+a.text-warning:hover, -+a.text-warning:focus { -+ color: #a47e3c; -+} -+ -+.text-error { -+ color: #b94a48; -+} -+ -+a.text-error:hover, -+a.text-error:focus { -+ color: #953b39; -+} -+ -+.text-info { -+ color: #3a87ad; -+} -+ -+a.text-info:hover, -+a.text-info:focus { -+ color: #2d6987; -+} -+ -+.text-success { -+ color: #468847; -+} -+ -+a.text-success:hover, -+a.text-success:focus { -+ color: #356635; -+} -+ -+.text-left { -+ text-align: left; -+} -+ -+.text-right { -+ text-align: right; -+} -+ -+.text-center { -+ text-align: center; -+} -+ -+h1, -+h2, -+h3, -+h4, -+h5, -+h6 { -+ margin: 10px 0; -+ font-family: inherit; -+ font-weight: bold; -+ line-height: 20px; -+ color: inherit; -+ text-rendering: optimizelegibility; -+} -+ -+h1 small, -+h2 small, -+h3 small, -+h4 small, -+h5 small, -+h6 small { -+ font-weight: normal; -+ line-height: 1; -+ color: #999999; -+} -+ -+h1, -+h2, -+h3 { -+ line-height: 40px; -+} -+ -+h1 { -+ font-size: 38.5px; -+} -+ -+h2 { -+ font-size: 31.5px; -+} -+ -+h3 { -+ font-size: 24.5px; -+} -+ -+h4 { -+ font-size: 17.5px; -+} -+ -+h5 { -+ font-size: 14px; -+} -+ -+h6 { -+ font-size: 11.9px; -+} -+ -+h1 small { -+ font-size: 24.5px; -+} -+ -+h2 small { -+ font-size: 17.5px; -+} -+ -+h3 small { -+ font-size: 14px; -+} -+ -+h4 small { -+ font-size: 14px; -+} -+ -+.page-header { -+ padding-bottom: 9px; -+ margin: 20px 0 30px; -+ border-bottom: 1px solid #eeeeee; -+} -+ -+ul, -+ol { -+ padding: 0; -+ margin: 0 0 10px 25px; -+} -+ -+ul ul, -+ul ol, -+ol ol, -+ol ul { -+ margin-bottom: 0; -+} -+ -+li { -+ line-height: 20px; -+} -+ -+ul.unstyled, -+ol.unstyled { -+ margin-left: 0; -+ list-style: none; -+} -+ -+ul.inline, -+ol.inline { -+ margin-left: 0; -+ list-style: none; -+} -+ -+ul.inline > li, -+ol.inline > li { -+ display: inline-block; -+ *display: inline; -+ padding-right: 5px; -+ padding-left: 5px; -+ *zoom: 1; -+} -+ -+dl { -+ margin-bottom: 20px; -+} -+ -+dt, -+dd { -+ line-height: 20px; -+} -+ -+dt { -+ font-weight: bold; -+} -+ -+dd { -+ margin-left: 10px; -+} -+ -+.dl-horizontal { -+ *zoom: 1; -+} -+ -+.dl-horizontal:before, -+.dl-horizontal:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.dl-horizontal:after { -+ clear: both; -+} -+ -+.dl-horizontal dt { -+ float: left; -+ width: 160px; -+ overflow: hidden; -+ clear: left; -+ text-align: right; -+ text-overflow: ellipsis; -+ white-space: nowrap; -+} -+ -+.dl-horizontal dd { -+ margin-left: 180px; -+} -+ -+hr { -+ margin: 20px 0; -+ border: 0; -+ border-top: 1px solid #eeeeee; -+ border-bottom: 1px solid #ffffff; -+} -+ -+abbr[title], -+abbr[data-original-title] { -+ cursor: help; -+ border-bottom: 1px dotted #999999; -+} -+ -+abbr.initialism { -+ font-size: 90%; -+ text-transform: uppercase; -+} -+ -+blockquote { -+ padding: 0 0 0 15px; -+ margin: 0 0 20px; -+ border-left: 5px solid #eeeeee; -+} -+ -+blockquote p { -+ margin-bottom: 0; -+ font-size: 17.5px; -+ font-weight: 300; -+ line-height: 1.25; -+} -+ -+blockquote small { -+ display: block; -+ line-height: 20px; -+ color: #999999; -+} -+ -+blockquote small:before { -+ content: '\2014 \00A0'; -+} -+ -+blockquote.pull-right { -+ float: right; -+ padding-right: 15px; -+ padding-left: 0; -+ border-right: 5px solid #eeeeee; -+ border-left: 0; -+} -+ -+blockquote.pull-right p, -+blockquote.pull-right small { -+ text-align: right; -+} -+ -+blockquote.pull-right small:before { -+ content: ''; -+} -+ -+blockquote.pull-right small:after { -+ content: '\00A0 \2014'; -+} -+ -+q:before, -+q:after, -+blockquote:before, -+blockquote:after { -+ content: ""; -+} -+ -+address { -+ display: block; -+ margin-bottom: 20px; -+ font-style: normal; -+ line-height: 20px; -+} -+ -+code, -+pre { -+ padding: 0 3px 2px; -+ font-family: Monaco, Menlo, Consolas, "Courier New", monospace; -+ font-size: 12px; -+ color: #333333; -+ -webkit-border-radius: 3px; -+ -moz-border-radius: 3px; -+ border-radius: 3px; -+} -+ -+code { -+ padding: 2px 4px; -+ color: #d14; -+ white-space: nowrap; -+ background-color: #f7f7f9; -+ border: 1px solid #e1e1e8; -+} -+ -+pre { -+ display: block; -+ padding: 9.5px; -+ margin: 0 0 10px; -+ font-size: 13px; -+ line-height: 20px; -+ word-break: break-all; -+ word-wrap: break-word; -+ white-space: pre; -+ white-space: pre-wrap; -+ background-color: #f5f5f5; -+ border: 1px solid #ccc; -+ border: 1px solid rgba(0, 0, 0, 0.15); -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+pre.prettyprint { -+ margin-bottom: 20px; -+} -+ -+pre code { -+ padding: 0; -+ color: inherit; -+ white-space: pre; -+ white-space: pre-wrap; -+ background-color: transparent; -+ border: 0; -+} -+ -+.pre-scrollable { -+ max-height: 340px; -+ overflow-y: scroll; -+} -+ -+form { -+ margin: 0 0 20px; -+} -+ -+fieldset { -+ padding: 0; -+ margin: 0; -+ border: 0; -+} -+ -+legend { -+ display: block; -+ width: 100%; -+ padding: 0; -+ margin-bottom: 20px; -+ font-size: 21px; -+ line-height: 40px; -+ color: #333333; -+ border: 0; -+ border-bottom: 1px solid #e5e5e5; -+} -+ -+legend small { -+ font-size: 15px; -+ color: #999999; -+} -+ -+label, -+input, -+button, -+select, -+textarea { -+ font-size: 14px; -+ font-weight: normal; -+ line-height: 20px; -+} -+ -+input, -+button, -+select, -+textarea { -+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -+} -+ -+label { -+ display: block; -+ margin-bottom: 5px; -+} -+ -+select, -+textarea, -+input[type="text"], -+input[type="password"], -+input[type="datetime"], -+input[type="datetime-local"], -+input[type="date"], -+input[type="month"], -+input[type="time"], -+input[type="week"], -+input[type="number"], -+input[type="email"], -+input[type="url"], -+input[type="search"], -+input[type="tel"], -+input[type="color"], -+.uneditable-input { -+ display: inline-block; -+ height: 20px; -+ padding: 4px 6px; -+ margin-bottom: 10px; -+ font-size: 14px; -+ line-height: 20px; -+ color: #555555; -+ vertical-align: middle; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+input, -+textarea, -+.uneditable-input { -+ width: 206px; -+} -+ -+textarea { -+ height: auto; -+} -+ -+textarea, -+input[type="text"], -+input[type="password"], -+input[type="datetime"], -+input[type="datetime-local"], -+input[type="date"], -+input[type="month"], -+input[type="time"], -+input[type="week"], -+input[type="number"], -+input[type="email"], -+input[type="url"], -+input[type="search"], -+input[type="tel"], -+input[type="color"], -+.uneditable-input { -+ background-color: #ffffff; -+ border: 1px solid #cccccc; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -+ -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -+ -o-transition: border linear 0.2s, box-shadow linear 0.2s; -+ transition: border linear 0.2s, box-shadow linear 0.2s; -+} -+ -+textarea:focus, -+input[type="text"]:focus, -+input[type="password"]:focus, -+input[type="datetime"]:focus, -+input[type="datetime-local"]:focus, -+input[type="date"]:focus, -+input[type="month"]:focus, -+input[type="time"]:focus, -+input[type="week"]:focus, -+input[type="number"]:focus, -+input[type="email"]:focus, -+input[type="url"]:focus, -+input[type="search"]:focus, -+input[type="tel"]:focus, -+input[type="color"]:focus, -+.uneditable-input:focus { -+ border-color: rgba(82, 168, 236, 0.8); -+ outline: 0; -+ outline: thin dotted \9; -+ /* IE6-9 */ -+ -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -+} -+ -+input[type="radio"], -+input[type="checkbox"] { -+ margin: 4px 0 0; -+ margin-top: 1px \9; -+ *margin-top: 0; -+ line-height: normal; -+} -+ -+input[type="file"], -+input[type="image"], -+input[type="submit"], -+input[type="reset"], -+input[type="button"], -+input[type="radio"], -+input[type="checkbox"] { -+ width: auto; -+} -+ -+select, -+input[type="file"] { -+ height: 30px; -+ /* In IE7, the height of the select element cannot be changed by height, only font-size */ -+ -+ *margin-top: 4px; -+ /* For IE7, add top margin to align select with labels */ -+ -+ line-height: 30px; -+} -+ -+select { -+ width: 220px; -+ background-color: #ffffff; -+ border: 1px solid #cccccc; -+} -+ -+select[multiple], -+select[size] { -+ height: auto; -+} -+ -+select:focus, -+input[type="file"]:focus, -+input[type="radio"]:focus, -+input[type="checkbox"]:focus { -+ outline: thin dotted #333; -+ outline: 5px auto -webkit-focus-ring-color; -+ outline-offset: -2px; -+} -+ -+.uneditable-input, -+.uneditable-textarea { -+ color: #999999; -+ cursor: not-allowed; -+ background-color: #fcfcfc; -+ border-color: #cccccc; -+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -+} -+ -+.uneditable-input { -+ overflow: hidden; -+ white-space: nowrap; -+} -+ -+.uneditable-textarea { -+ width: auto; -+ height: auto; -+} -+ -+input:-moz-placeholder, -+textarea:-moz-placeholder { -+ color: #999999; -+} -+ -+input:-ms-input-placeholder, -+textarea:-ms-input-placeholder { -+ color: #999999; -+} -+ -+input::-webkit-input-placeholder, -+textarea::-webkit-input-placeholder { -+ color: #999999; -+} -+ -+.radio, -+.checkbox { -+ min-height: 20px; -+ padding-left: 20px; -+} -+ -+.radio input[type="radio"], -+.checkbox input[type="checkbox"] { -+ float: left; -+ margin-left: -20px; -+} -+ -+.controls > .radio:first-child, -+.controls > .checkbox:first-child { -+ padding-top: 5px; -+} -+ -+.radio.inline, -+.checkbox.inline { -+ display: inline-block; -+ padding-top: 5px; -+ margin-bottom: 0; -+ vertical-align: middle; -+} -+ -+.radio.inline + .radio.inline, -+.checkbox.inline + .checkbox.inline { -+ margin-left: 10px; -+} -+ -+.input-mini { -+ width: 60px; -+} -+ -+.input-small { -+ width: 90px; -+} -+ -+.input-medium { -+ width: 150px; -+} -+ -+.input-large { -+ width: 210px; -+} -+ -+.input-xlarge { -+ width: 270px; -+} -+ -+.input-xxlarge { -+ width: 530px; -+} -+ -+input[class*="span"], -+select[class*="span"], -+textarea[class*="span"], -+.uneditable-input[class*="span"], -+.row-fluid input[class*="span"], -+.row-fluid select[class*="span"], -+.row-fluid textarea[class*="span"], -+.row-fluid .uneditable-input[class*="span"] { -+ float: none; -+ margin-left: 0; -+} -+ -+.input-append input[class*="span"], -+.input-append .uneditable-input[class*="span"], -+.input-prepend input[class*="span"], -+.input-prepend .uneditable-input[class*="span"], -+.row-fluid input[class*="span"], -+.row-fluid select[class*="span"], -+.row-fluid textarea[class*="span"], -+.row-fluid .uneditable-input[class*="span"], -+.row-fluid .input-prepend [class*="span"], -+.row-fluid .input-append [class*="span"] { -+ display: inline-block; -+} -+ -+input, -+textarea, -+.uneditable-input { -+ margin-left: 0; -+} -+ -+.controls-row [class*="span"] + [class*="span"] { -+ margin-left: 20px; -+} -+ -+input.span12, -+textarea.span12, -+.uneditable-input.span12 { -+ width: 926px; -+} -+ -+input.span11, -+textarea.span11, -+.uneditable-input.span11 { -+ width: 846px; -+} -+ -+input.span10, -+textarea.span10, -+.uneditable-input.span10 { -+ width: 766px; -+} -+ -+input.span9, -+textarea.span9, -+.uneditable-input.span9 { -+ width: 686px; -+} -+ -+input.span8, -+textarea.span8, -+.uneditable-input.span8 { -+ width: 606px; -+} -+ -+input.span7, -+textarea.span7, -+.uneditable-input.span7 { -+ width: 526px; -+} -+ -+input.span6, -+textarea.span6, -+.uneditable-input.span6 { -+ width: 446px; -+} -+ -+input.span5, -+textarea.span5, -+.uneditable-input.span5 { -+ width: 366px; -+} -+ -+input.span4, -+textarea.span4, -+.uneditable-input.span4 { -+ width: 286px; -+} -+ -+input.span3, -+textarea.span3, -+.uneditable-input.span3 { -+ width: 206px; -+} -+ -+input.span2, -+textarea.span2, -+.uneditable-input.span2 { -+ width: 126px; -+} -+ -+input.span1, -+textarea.span1, -+.uneditable-input.span1 { -+ width: 46px; -+} -+ -+.controls-row { -+ *zoom: 1; -+} -+ -+.controls-row:before, -+.controls-row:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.controls-row:after { -+ clear: both; -+} -+ -+.controls-row [class*="span"], -+.row-fluid .controls-row [class*="span"] { -+ float: left; -+} -+ -+.controls-row .checkbox[class*="span"], -+.controls-row .radio[class*="span"] { -+ padding-top: 5px; -+} -+ -+input[disabled], -+select[disabled], -+textarea[disabled], -+input[readonly], -+select[readonly], -+textarea[readonly] { -+ cursor: not-allowed; -+ background-color: #eeeeee; -+} -+ -+input[type="radio"][disabled], -+input[type="checkbox"][disabled], -+input[type="radio"][readonly], -+input[type="checkbox"][readonly] { -+ background-color: transparent; -+} -+ -+.control-group.warning .control-label, -+.control-group.warning .help-block, -+.control-group.warning .help-inline { -+ color: #c09853; -+} -+ -+.control-group.warning .checkbox, -+.control-group.warning .radio, -+.control-group.warning input, -+.control-group.warning select, -+.control-group.warning textarea { -+ color: #c09853; -+} -+ -+.control-group.warning input, -+.control-group.warning select, -+.control-group.warning textarea { -+ border-color: #c09853; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+} -+ -+.control-group.warning input:focus, -+.control-group.warning select:focus, -+.control-group.warning textarea:focus { -+ border-color: #a47e3c; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -+} -+ -+.control-group.warning .input-prepend .add-on, -+.control-group.warning .input-append .add-on { -+ color: #c09853; -+ background-color: #fcf8e3; -+ border-color: #c09853; -+} -+ -+.control-group.error .control-label, -+.control-group.error .help-block, -+.control-group.error .help-inline { -+ color: #b94a48; -+} -+ -+.control-group.error .checkbox, -+.control-group.error .radio, -+.control-group.error input, -+.control-group.error select, -+.control-group.error textarea { -+ color: #b94a48; -+} -+ -+.control-group.error input, -+.control-group.error select, -+.control-group.error textarea { -+ border-color: #b94a48; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+} -+ -+.control-group.error input:focus, -+.control-group.error select:focus, -+.control-group.error textarea:focus { -+ border-color: #953b39; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -+} -+ -+.control-group.error .input-prepend .add-on, -+.control-group.error .input-append .add-on { -+ color: #b94a48; -+ background-color: #f2dede; -+ border-color: #b94a48; -+} -+ -+.control-group.success .control-label, -+.control-group.success .help-block, -+.control-group.success .help-inline { -+ color: #468847; -+} -+ -+.control-group.success .checkbox, -+.control-group.success .radio, -+.control-group.success input, -+.control-group.success select, -+.control-group.success textarea { -+ color: #468847; -+} -+ -+.control-group.success input, -+.control-group.success select, -+.control-group.success textarea { -+ border-color: #468847; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+} -+ -+.control-group.success input:focus, -+.control-group.success select:focus, -+.control-group.success textarea:focus { -+ border-color: #356635; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -+} -+ -+.control-group.success .input-prepend .add-on, -+.control-group.success .input-append .add-on { -+ color: #468847; -+ background-color: #dff0d8; -+ border-color: #468847; -+} -+ -+.control-group.info .control-label, -+.control-group.info .help-block, -+.control-group.info .help-inline { -+ color: #3a87ad; -+} -+ -+.control-group.info .checkbox, -+.control-group.info .radio, -+.control-group.info input, -+.control-group.info select, -+.control-group.info textarea { -+ color: #3a87ad; -+} -+ -+.control-group.info input, -+.control-group.info select, -+.control-group.info textarea { -+ border-color: #3a87ad; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -+} -+ -+.control-group.info input:focus, -+.control-group.info select:focus, -+.control-group.info textarea:focus { -+ border-color: #2d6987; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -+} -+ -+.control-group.info .input-prepend .add-on, -+.control-group.info .input-append .add-on { -+ color: #3a87ad; -+ background-color: #d9edf7; -+ border-color: #3a87ad; -+} -+ -+input:focus:invalid, -+textarea:focus:invalid, -+select:focus:invalid { -+ color: #b94a48; -+ border-color: #ee5f5b; -+} -+ -+input:focus:invalid:focus, -+textarea:focus:invalid:focus, -+select:focus:invalid:focus { -+ border-color: #e9322d; -+ -webkit-box-shadow: 0 0 6px #f8b9b7; -+ -moz-box-shadow: 0 0 6px #f8b9b7; -+ box-shadow: 0 0 6px #f8b9b7; -+} -+ -+.form-actions { -+ padding: 19px 20px 20px; -+ margin-top: 20px; -+ margin-bottom: 20px; -+ background-color: #f5f5f5; -+ border-top: 1px solid #e5e5e5; -+ *zoom: 1; -+} -+ -+.form-actions:before, -+.form-actions:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.form-actions:after { -+ clear: both; -+} -+ -+.help-block, -+.help-inline { -+ color: #595959; -+} -+ -+.help-block { -+ display: block; -+ margin-bottom: 10px; -+} -+ -+.help-inline { -+ display: inline-block; -+ *display: inline; -+ padding-left: 5px; -+ vertical-align: middle; -+ *zoom: 1; -+} -+ -+.input-append, -+.input-prepend { -+ display: inline-block; -+ margin-bottom: 10px; -+ font-size: 0; -+ white-space: nowrap; -+ vertical-align: middle; -+} -+ -+.input-append input, -+.input-prepend input, -+.input-append select, -+.input-prepend select, -+.input-append .uneditable-input, -+.input-prepend .uneditable-input, -+.input-append .dropdown-menu, -+.input-prepend .dropdown-menu, -+.input-append .popover, -+.input-prepend .popover { -+ font-size: 14px; -+} -+ -+.input-append input, -+.input-prepend input, -+.input-append select, -+.input-prepend select, -+.input-append .uneditable-input, -+.input-prepend .uneditable-input { -+ position: relative; -+ margin-bottom: 0; -+ *margin-left: 0; -+ vertical-align: top; -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.input-append input:focus, -+.input-prepend input:focus, -+.input-append select:focus, -+.input-prepend select:focus, -+.input-append .uneditable-input:focus, -+.input-prepend .uneditable-input:focus { -+ z-index: 2; -+} -+ -+.input-append .add-on, -+.input-prepend .add-on { -+ display: inline-block; -+ width: auto; -+ height: 20px; -+ min-width: 16px; -+ padding: 4px 5px; -+ font-size: 14px; -+ font-weight: normal; -+ line-height: 20px; -+ text-align: center; -+ text-shadow: 0 1px 0 #ffffff; -+ background-color: #eeeeee; -+ border: 1px solid #ccc; -+} -+ -+.input-append .add-on, -+.input-prepend .add-on, -+.input-append .btn, -+.input-prepend .btn, -+.input-append .btn-group > .dropdown-toggle, -+.input-prepend .btn-group > .dropdown-toggle { -+ vertical-align: top; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.input-append .active, -+.input-prepend .active { -+ background-color: #a9dba9; -+ border-color: #46a546; -+} -+ -+.input-prepend .add-on, -+.input-prepend .btn { -+ margin-right: -1px; -+} -+ -+.input-prepend .add-on:first-child, -+.input-prepend .btn:first-child { -+ -webkit-border-radius: 4px 0 0 4px; -+ -moz-border-radius: 4px 0 0 4px; -+ border-radius: 4px 0 0 4px; -+} -+ -+.input-append input, -+.input-append select, -+.input-append .uneditable-input { -+ -webkit-border-radius: 4px 0 0 4px; -+ -moz-border-radius: 4px 0 0 4px; -+ border-radius: 4px 0 0 4px; -+} -+ -+.input-append input + .btn-group .btn:last-child, -+.input-append select + .btn-group .btn:last-child, -+.input-append .uneditable-input + .btn-group .btn:last-child { -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.input-append .add-on, -+.input-append .btn, -+.input-append .btn-group { -+ margin-left: -1px; -+} -+ -+.input-append .add-on:last-child, -+.input-append .btn:last-child, -+.input-append .btn-group:last-child > .dropdown-toggle { -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.input-prepend.input-append input, -+.input-prepend.input-append select, -+.input-prepend.input-append .uneditable-input { -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.input-prepend.input-append input + .btn-group .btn, -+.input-prepend.input-append select + .btn-group .btn, -+.input-prepend.input-append .uneditable-input + .btn-group .btn { -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.input-prepend.input-append .add-on:first-child, -+.input-prepend.input-append .btn:first-child { -+ margin-right: -1px; -+ -webkit-border-radius: 4px 0 0 4px; -+ -moz-border-radius: 4px 0 0 4px; -+ border-radius: 4px 0 0 4px; -+} -+ -+.input-prepend.input-append .add-on:last-child, -+.input-prepend.input-append .btn:last-child { -+ margin-left: -1px; -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.input-prepend.input-append .btn-group:first-child { -+ margin-left: 0; -+} -+ -+input.search-query { -+ padding-right: 14px; -+ padding-right: 4px \9; -+ padding-left: 14px; -+ padding-left: 4px \9; -+ /* IE7-8 doesn't have border-radius, so don't indent the padding */ -+ -+ margin-bottom: 0; -+ -webkit-border-radius: 15px; -+ -moz-border-radius: 15px; -+ border-radius: 15px; -+} -+ -+/* Allow for input prepend/append in search forms */ -+ -+.form-search .input-append .search-query, -+.form-search .input-prepend .search-query { -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.form-search .input-append .search-query { -+ -webkit-border-radius: 14px 0 0 14px; -+ -moz-border-radius: 14px 0 0 14px; -+ border-radius: 14px 0 0 14px; -+} -+ -+.form-search .input-append .btn { -+ -webkit-border-radius: 0 14px 14px 0; -+ -moz-border-radius: 0 14px 14px 0; -+ border-radius: 0 14px 14px 0; -+} -+ -+.form-search .input-prepend .search-query { -+ -webkit-border-radius: 0 14px 14px 0; -+ -moz-border-radius: 0 14px 14px 0; -+ border-radius: 0 14px 14px 0; -+} -+ -+.form-search .input-prepend .btn { -+ -webkit-border-radius: 14px 0 0 14px; -+ -moz-border-radius: 14px 0 0 14px; -+ border-radius: 14px 0 0 14px; -+} -+ -+.form-search input, -+.form-inline input, -+.form-horizontal input, -+.form-search textarea, -+.form-inline textarea, -+.form-horizontal textarea, -+.form-search select, -+.form-inline select, -+.form-horizontal select, -+.form-search .help-inline, -+.form-inline .help-inline, -+.form-horizontal .help-inline, -+.form-search .uneditable-input, -+.form-inline .uneditable-input, -+.form-horizontal .uneditable-input, -+.form-search .input-prepend, -+.form-inline .input-prepend, -+.form-horizontal .input-prepend, -+.form-search .input-append, -+.form-inline .input-append, -+.form-horizontal .input-append { -+ display: inline-block; -+ *display: inline; -+ margin-bottom: 0; -+ vertical-align: middle; -+ *zoom: 1; -+} -+ -+.form-search .hide, -+.form-inline .hide, -+.form-horizontal .hide { -+ display: none; -+} -+ -+.form-search label, -+.form-inline label, -+.form-search .btn-group, -+.form-inline .btn-group { -+ display: inline-block; -+} -+ -+.form-search .input-append, -+.form-inline .input-append, -+.form-search .input-prepend, -+.form-inline .input-prepend { -+ margin-bottom: 0; -+} -+ -+.form-search .radio, -+.form-search .checkbox, -+.form-inline .radio, -+.form-inline .checkbox { -+ padding-left: 0; -+ margin-bottom: 0; -+ vertical-align: middle; -+} -+ -+.form-search .radio input[type="radio"], -+.form-search .checkbox input[type="checkbox"], -+.form-inline .radio input[type="radio"], -+.form-inline .checkbox input[type="checkbox"] { -+ float: left; -+ margin-right: 3px; -+ margin-left: 0; -+} -+ -+.control-group { -+ margin-bottom: 10px; -+} -+ -+legend + .control-group { -+ margin-top: 20px; -+ -webkit-margin-top-collapse: separate; -+} -+ -+.form-horizontal .control-group { -+ margin-bottom: 20px; -+ *zoom: 1; -+} -+ -+.form-horizontal .control-group:before, -+.form-horizontal .control-group:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.form-horizontal .control-group:after { -+ clear: both; -+} -+ -+.form-horizontal .control-label { -+ float: left; -+ width: 160px; -+ padding-top: 5px; -+ text-align: right; -+} -+ -+.form-horizontal .controls { -+ *display: inline-block; -+ *padding-left: 20px; -+ margin-left: 180px; -+ *margin-left: 0; -+} -+ -+.form-horizontal .controls:first-child { -+ *padding-left: 180px; -+} -+ -+.form-horizontal .help-block { -+ margin-bottom: 0; -+} -+ -+.form-horizontal input + .help-block, -+.form-horizontal select + .help-block, -+.form-horizontal textarea + .help-block, -+.form-horizontal .uneditable-input + .help-block, -+.form-horizontal .input-prepend + .help-block, -+.form-horizontal .input-append + .help-block { -+ margin-top: 10px; -+} -+ -+.form-horizontal .form-actions { -+ padding-left: 180px; -+} -+ -+table { -+ max-width: 100%; -+ background-color: transparent; -+ border-collapse: collapse; -+ border-spacing: 0; -+} -+ -+.table { -+ width: 100%; -+ margin-bottom: 20px; -+} -+ -+.table th, -+.table td { -+ padding: 8px; -+ line-height: 20px; -+ text-align: left; -+ vertical-align: top; -+ border-top: 1px solid #dddddd; -+} -+ -+.table th { -+ font-weight: bold; -+} -+ -+.table thead th { -+ vertical-align: bottom; -+} -+ -+.table caption + thead tr:first-child th, -+.table caption + thead tr:first-child td, -+.table colgroup + thead tr:first-child th, -+.table colgroup + thead tr:first-child td, -+.table thead:first-child tr:first-child th, -+.table thead:first-child tr:first-child td { -+ border-top: 0; -+} -+ -+.table tbody + tbody { -+ border-top: 2px solid #dddddd; -+} -+ -+.table .table { -+ background-color: #ffffff; -+} -+ -+.table-condensed th, -+.table-condensed td { -+ padding: 4px 5px; -+} -+ -+.table-bordered { -+ border: 1px solid #dddddd; -+ border-collapse: separate; -+ *border-collapse: collapse; -+ border-left: 0; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.table-bordered th, -+.table-bordered td { -+ border-left: 1px solid #dddddd; -+} -+ -+.table-bordered caption + thead tr:first-child th, -+.table-bordered caption + tbody tr:first-child th, -+.table-bordered caption + tbody tr:first-child td, -+.table-bordered colgroup + thead tr:first-child th, -+.table-bordered colgroup + tbody tr:first-child th, -+.table-bordered colgroup + tbody tr:first-child td, -+.table-bordered thead:first-child tr:first-child th, -+.table-bordered tbody:first-child tr:first-child th, -+.table-bordered tbody:first-child tr:first-child td { -+ border-top: 0; -+} -+ -+.table-bordered thead:first-child tr:first-child > th:first-child, -+.table-bordered tbody:first-child tr:first-child > td:first-child, -+.table-bordered tbody:first-child tr:first-child > th:first-child { -+ -webkit-border-top-left-radius: 4px; -+ border-top-left-radius: 4px; -+ -moz-border-radius-topleft: 4px; -+} -+ -+.table-bordered thead:first-child tr:first-child > th:last-child, -+.table-bordered tbody:first-child tr:first-child > td:last-child, -+.table-bordered tbody:first-child tr:first-child > th:last-child { -+ -webkit-border-top-right-radius: 4px; -+ border-top-right-radius: 4px; -+ -moz-border-radius-topright: 4px; -+} -+ -+.table-bordered thead:last-child tr:last-child > th:first-child, -+.table-bordered tbody:last-child tr:last-child > td:first-child, -+.table-bordered tbody:last-child tr:last-child > th:first-child, -+.table-bordered tfoot:last-child tr:last-child > td:first-child, -+.table-bordered tfoot:last-child tr:last-child > th:first-child { -+ -webkit-border-bottom-left-radius: 4px; -+ border-bottom-left-radius: 4px; -+ -moz-border-radius-bottomleft: 4px; -+} -+ -+.table-bordered thead:last-child tr:last-child > th:last-child, -+.table-bordered tbody:last-child tr:last-child > td:last-child, -+.table-bordered tbody:last-child tr:last-child > th:last-child, -+.table-bordered tfoot:last-child tr:last-child > td:last-child, -+.table-bordered tfoot:last-child tr:last-child > th:last-child { -+ -webkit-border-bottom-right-radius: 4px; -+ border-bottom-right-radius: 4px; -+ -moz-border-radius-bottomright: 4px; -+} -+ -+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { -+ -webkit-border-bottom-left-radius: 0; -+ border-bottom-left-radius: 0; -+ -moz-border-radius-bottomleft: 0; -+} -+ -+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { -+ -webkit-border-bottom-right-radius: 0; -+ border-bottom-right-radius: 0; -+ -moz-border-radius-bottomright: 0; -+} -+ -+.table-bordered caption + thead tr:first-child th:first-child, -+.table-bordered caption + tbody tr:first-child td:first-child, -+.table-bordered colgroup + thead tr:first-child th:first-child, -+.table-bordered colgroup + tbody tr:first-child td:first-child { -+ -webkit-border-top-left-radius: 4px; -+ border-top-left-radius: 4px; -+ -moz-border-radius-topleft: 4px; -+} -+ -+.table-bordered caption + thead tr:first-child th:last-child, -+.table-bordered caption + tbody tr:first-child td:last-child, -+.table-bordered colgroup + thead tr:first-child th:last-child, -+.table-bordered colgroup + tbody tr:first-child td:last-child { -+ -webkit-border-top-right-radius: 4px; -+ border-top-right-radius: 4px; -+ -moz-border-radius-topright: 4px; -+} -+ -+.table-striped tbody > tr:nth-child(odd) > td, -+.table-striped tbody > tr:nth-child(odd) > th { -+ background-color: #f9f9f9; -+} -+ -+.table-hover tbody tr:hover > td, -+.table-hover tbody tr:hover > th { -+ background-color: #f5f5f5; -+} -+ -+table td[class*="span"], -+table th[class*="span"], -+.row-fluid table td[class*="span"], -+.row-fluid table th[class*="span"] { -+ display: table-cell; -+ float: none; -+ margin-left: 0; -+} -+ -+.table td.span1, -+.table th.span1 { -+ float: none; -+ width: 44px; -+ margin-left: 0; -+} -+ -+.table td.span2, -+.table th.span2 { -+ float: none; -+ width: 124px; -+ margin-left: 0; -+} -+ -+.table td.span3, -+.table th.span3 { -+ float: none; -+ width: 204px; -+ margin-left: 0; -+} -+ -+.table td.span4, -+.table th.span4 { -+ float: none; -+ width: 284px; -+ margin-left: 0; -+} -+ -+.table td.span5, -+.table th.span5 { -+ float: none; -+ width: 364px; -+ margin-left: 0; -+} -+ -+.table td.span6, -+.table th.span6 { -+ float: none; -+ width: 444px; -+ margin-left: 0; -+} -+ -+.table td.span7, -+.table th.span7 { -+ float: none; -+ width: 524px; -+ margin-left: 0; -+} -+ -+.table td.span8, -+.table th.span8 { -+ float: none; -+ width: 604px; -+ margin-left: 0; -+} -+ -+.table td.span9, -+.table th.span9 { -+ float: none; -+ width: 684px; -+ margin-left: 0; -+} -+ -+.table td.span10, -+.table th.span10 { -+ float: none; -+ width: 764px; -+ margin-left: 0; -+} -+ -+.table td.span11, -+.table th.span11 { -+ float: none; -+ width: 844px; -+ margin-left: 0; -+} -+ -+.table td.span12, -+.table th.span12 { -+ float: none; -+ width: 924px; -+ margin-left: 0; -+} -+ -+.table tbody tr.success > td { -+ background-color: #dff0d8; -+} -+ -+.table tbody tr.error > td { -+ background-color: #f2dede; -+} -+ -+.table tbody tr.warning > td { -+ background-color: #fcf8e3; -+} -+ -+.table tbody tr.info > td { -+ background-color: #d9edf7; -+} -+ -+.table-hover tbody tr.success:hover > td { -+ background-color: #d0e9c6; -+} -+ -+.table-hover tbody tr.error:hover > td { -+ background-color: #ebcccc; -+} -+ -+.table-hover tbody tr.warning:hover > td { -+ background-color: #faf2cc; -+} -+ -+.table-hover tbody tr.info:hover > td { -+ background-color: #c4e3f3; -+} -+ -+[class^="icon-"], -+[class*=" icon-"] { -+ display: inline-block; -+ width: 14px; -+ height: 14px; -+ margin-top: 1px; -+ *margin-right: .3em; -+ line-height: 14px; -+ vertical-align: text-top; -+ background-image: url("../img/glyphicons-halflings.png"); -+ background-position: 14px 14px; -+ background-repeat: no-repeat; -+} -+ -+/* White icons with optional class, or on hover/focus/active states of certain elements */ -+ -+.icon-white, -+.nav-pills > .active > a > [class^="icon-"], -+.nav-pills > .active > a > [class*=" icon-"], -+.nav-list > .active > a > [class^="icon-"], -+.nav-list > .active > a > [class*=" icon-"], -+.navbar-inverse .nav > .active > a > [class^="icon-"], -+.navbar-inverse .nav > .active > a > [class*=" icon-"], -+.dropdown-menu > li > a:hover > [class^="icon-"], -+.dropdown-menu > li > a:focus > [class^="icon-"], -+.dropdown-menu > li > a:hover > [class*=" icon-"], -+.dropdown-menu > li > a:focus > [class*=" icon-"], -+.dropdown-menu > .active > a > [class^="icon-"], -+.dropdown-menu > .active > a > [class*=" icon-"], -+.dropdown-submenu:hover > a > [class^="icon-"], -+.dropdown-submenu:focus > a > [class^="icon-"], -+.dropdown-submenu:hover > a > [class*=" icon-"], -+.dropdown-submenu:focus > a > [class*=" icon-"] { -+ background-image: url("../img/glyphicons-halflings-white.png"); -+} -+ -+.icon-glass { -+ background-position: 0 0; -+} -+ -+.icon-music { -+ background-position: -24px 0; -+} -+ -+.icon-search { -+ background-position: -48px 0; -+} -+ -+.icon-envelope { -+ background-position: -72px 0; -+} -+ -+.icon-heart { -+ background-position: -96px 0; -+} -+ -+.icon-star { -+ background-position: -120px 0; -+} -+ -+.icon-star-empty { -+ background-position: -144px 0; -+} -+ -+.icon-user { -+ background-position: -168px 0; -+} -+ -+.icon-film { -+ background-position: -192px 0; -+} -+ -+.icon-th-large { -+ background-position: -216px 0; -+} -+ -+.icon-th { -+ background-position: -240px 0; -+} -+ -+.icon-th-list { -+ background-position: -264px 0; -+} -+ -+.icon-ok { -+ background-position: -288px 0; -+} -+ -+.icon-remove { -+ background-position: -312px 0; -+} -+ -+.icon-zoom-in { -+ background-position: -336px 0; -+} -+ -+.icon-zoom-out { -+ background-position: -360px 0; -+} -+ -+.icon-off { -+ background-position: -384px 0; -+} -+ -+.icon-signal { -+ background-position: -408px 0; -+} -+ -+.icon-cog { -+ background-position: -432px 0; -+} -+ -+.icon-trash { -+ background-position: -456px 0; -+} -+ -+.icon-home { -+ background-position: 0 -24px; -+} -+ -+.icon-file { -+ background-position: -24px -24px; -+} -+ -+.icon-time { -+ background-position: -48px -24px; -+} -+ -+.icon-road { -+ background-position: -72px -24px; -+} -+ -+.icon-download-alt { -+ background-position: -96px -24px; -+} -+ -+.icon-download { -+ background-position: -120px -24px; -+} -+ -+.icon-upload { -+ background-position: -144px -24px; -+} -+ -+.icon-inbox { -+ background-position: -168px -24px; -+} -+ -+.icon-play-circle { -+ background-position: -192px -24px; -+} -+ -+.icon-repeat { -+ background-position: -216px -24px; -+} -+ -+.icon-refresh { -+ background-position: -240px -24px; -+} -+ -+.icon-list-alt { -+ background-position: -264px -24px; -+} -+ -+.icon-lock { -+ background-position: -287px -24px; -+} -+ -+.icon-flag { -+ background-position: -312px -24px; -+} -+ -+.icon-headphones { -+ background-position: -336px -24px; -+} -+ -+.icon-volume-off { -+ background-position: -360px -24px; -+} -+ -+.icon-volume-down { -+ background-position: -384px -24px; -+} -+ -+.icon-volume-up { -+ background-position: -408px -24px; -+} -+ -+.icon-qrcode { -+ background-position: -432px -24px; -+} -+ -+.icon-barcode { -+ background-position: -456px -24px; -+} -+ -+.icon-tag { -+ background-position: 0 -48px; -+} -+ -+.icon-tags { -+ background-position: -25px -48px; -+} -+ -+.icon-book { -+ background-position: -48px -48px; -+} -+ -+.icon-bookmark { -+ background-position: -72px -48px; -+} -+ -+.icon-print { -+ background-position: -96px -48px; -+} -+ -+.icon-camera { -+ background-position: -120px -48px; -+} -+ -+.icon-font { -+ background-position: -144px -48px; -+} -+ -+.icon-bold { -+ background-position: -167px -48px; -+} -+ -+.icon-italic { -+ background-position: -192px -48px; -+} -+ -+.icon-text-height { -+ background-position: -216px -48px; -+} -+ -+.icon-text-width { -+ background-position: -240px -48px; -+} -+ -+.icon-align-left { -+ background-position: -264px -48px; -+} -+ -+.icon-align-center { -+ background-position: -288px -48px; -+} -+ -+.icon-align-right { -+ background-position: -312px -48px; -+} -+ -+.icon-align-justify { -+ background-position: -336px -48px; -+} -+ -+.icon-list { -+ background-position: -360px -48px; -+} -+ -+.icon-indent-left { -+ background-position: -384px -48px; -+} -+ -+.icon-indent-right { -+ background-position: -408px -48px; -+} -+ -+.icon-facetime-video { -+ background-position: -432px -48px; -+} -+ -+.icon-picture { -+ background-position: -456px -48px; -+} -+ -+.icon-pencil { -+ background-position: 0 -72px; -+} -+ -+.icon-map-marker { -+ background-position: -24px -72px; -+} -+ -+.icon-adjust { -+ background-position: -48px -72px; -+} -+ -+.icon-tint { -+ background-position: -72px -72px; -+} -+ -+.icon-edit { -+ background-position: -96px -72px; -+} -+ -+.icon-share { -+ background-position: -120px -72px; -+} -+ -+.icon-check { -+ background-position: -144px -72px; -+} -+ -+.icon-move { -+ background-position: -168px -72px; -+} -+ -+.icon-step-backward { -+ background-position: -192px -72px; -+} -+ -+.icon-fast-backward { -+ background-position: -216px -72px; -+} -+ -+.icon-backward { -+ background-position: -240px -72px; -+} -+ -+.icon-play { -+ background-position: -264px -72px; -+} -+ -+.icon-pause { -+ background-position: -288px -72px; -+} -+ -+.icon-stop { -+ background-position: -312px -72px; -+} -+ -+.icon-forward { -+ background-position: -336px -72px; -+} -+ -+.icon-fast-forward { -+ background-position: -360px -72px; -+} -+ -+.icon-step-forward { -+ background-position: -384px -72px; -+} -+ -+.icon-eject { -+ background-position: -408px -72px; -+} -+ -+.icon-chevron-left { -+ background-position: -432px -72px; -+} -+ -+.icon-chevron-right { -+ background-position: -456px -72px; -+} -+ -+.icon-plus-sign { -+ background-position: 0 -96px; -+} -+ -+.icon-minus-sign { -+ background-position: -24px -96px; -+} -+ -+.icon-remove-sign { -+ background-position: -48px -96px; -+} -+ -+.icon-ok-sign { -+ background-position: -72px -96px; -+} -+ -+.icon-question-sign { -+ background-position: -96px -96px; -+} -+ -+.icon-info-sign { -+ background-position: -120px -96px; -+} -+ -+.icon-screenshot { -+ background-position: -144px -96px; -+} -+ -+.icon-remove-circle { -+ background-position: -168px -96px; -+} -+ -+.icon-ok-circle { -+ background-position: -192px -96px; -+} -+ -+.icon-ban-circle { -+ background-position: -216px -96px; -+} -+ -+.icon-arrow-left { -+ background-position: -240px -96px; -+} -+ -+.icon-arrow-right { -+ background-position: -264px -96px; -+} -+ -+.icon-arrow-up { -+ background-position: -289px -96px; -+} -+ -+.icon-arrow-down { -+ background-position: -312px -96px; -+} -+ -+.icon-share-alt { -+ background-position: -336px -96px; -+} -+ -+.icon-resize-full { -+ background-position: -360px -96px; -+} -+ -+.icon-resize-small { -+ background-position: -384px -96px; -+} -+ -+.icon-plus { -+ background-position: -408px -96px; -+} -+ -+.icon-minus { -+ background-position: -433px -96px; -+} -+ -+.icon-asterisk { -+ background-position: -456px -96px; -+} -+ -+.icon-exclamation-sign { -+ background-position: 0 -120px; -+} -+ -+.icon-gift { -+ background-position: -24px -120px; -+} -+ -+.icon-leaf { -+ background-position: -48px -120px; -+} -+ -+.icon-fire { -+ background-position: -72px -120px; -+} -+ -+.icon-eye-open { -+ background-position: -96px -120px; -+} -+ -+.icon-eye-close { -+ background-position: -120px -120px; -+} -+ -+.icon-warning-sign { -+ background-position: -144px -120px; -+} -+ -+.icon-plane { -+ background-position: -168px -120px; -+} -+ -+.icon-calendar { -+ background-position: -192px -120px; -+} -+ -+.icon-random { -+ width: 16px; -+ background-position: -216px -120px; -+} -+ -+.icon-comment { -+ background-position: -240px -120px; -+} -+ -+.icon-magnet { -+ background-position: -264px -120px; -+} -+ -+.icon-chevron-up { -+ background-position: -288px -120px; -+} -+ -+.icon-chevron-down { -+ background-position: -313px -119px; -+} -+ -+.icon-retweet { -+ background-position: -336px -120px; -+} -+ -+.icon-shopping-cart { -+ background-position: -360px -120px; -+} -+ -+.icon-folder-close { -+ width: 16px; -+ background-position: -384px -120px; -+} -+ -+.icon-folder-open { -+ width: 16px; -+ background-position: -408px -120px; -+} -+ -+.icon-resize-vertical { -+ background-position: -432px -119px; -+} -+ -+.icon-resize-horizontal { -+ background-position: -456px -118px; -+} -+ -+.icon-hdd { -+ background-position: 0 -144px; -+} -+ -+.icon-bullhorn { -+ background-position: -24px -144px; -+} -+ -+.icon-bell { -+ background-position: -48px -144px; -+} -+ -+.icon-certificate { -+ background-position: -72px -144px; -+} -+ -+.icon-thumbs-up { -+ background-position: -96px -144px; -+} -+ -+.icon-thumbs-down { -+ background-position: -120px -144px; -+} -+ -+.icon-hand-right { -+ background-position: -144px -144px; -+} -+ -+.icon-hand-left { -+ background-position: -168px -144px; -+} -+ -+.icon-hand-up { -+ background-position: -192px -144px; -+} -+ -+.icon-hand-down { -+ background-position: -216px -144px; -+} -+ -+.icon-circle-arrow-right { -+ background-position: -240px -144px; -+} -+ -+.icon-circle-arrow-left { -+ background-position: -264px -144px; -+} -+ -+.icon-circle-arrow-up { -+ background-position: -288px -144px; -+} -+ -+.icon-circle-arrow-down { -+ background-position: -312px -144px; -+} -+ -+.icon-globe { -+ background-position: -336px -144px; -+} -+ -+.icon-wrench { -+ background-position: -360px -144px; -+} -+ -+.icon-tasks { -+ background-position: -384px -144px; -+} -+ -+.icon-filter { -+ background-position: -408px -144px; -+} -+ -+.icon-briefcase { -+ background-position: -432px -144px; -+} -+ -+.icon-fullscreen { -+ background-position: -456px -144px; -+} -+ -+.dropup, -+.dropdown { -+ position: relative; -+} -+ -+.dropdown-toggle { -+ *margin-bottom: -3px; -+} -+ -+.dropdown-toggle:active, -+.open .dropdown-toggle { -+ outline: 0; -+} -+ -+.caret { -+ display: inline-block; -+ width: 0; -+ height: 0; -+ vertical-align: top; -+ border-top: 4px solid #000000; -+ border-right: 4px solid transparent; -+ border-left: 4px solid transparent; -+ content: ""; -+} -+ -+.dropdown .caret { -+ margin-top: 8px; -+ margin-left: 2px; -+} -+ -+.dropdown-menu { -+ position: absolute; -+ top: 100%; -+ left: 0; -+ z-index: 1000; -+ display: none; -+ float: left; -+ min-width: 160px; -+ padding: 5px 0; -+ margin: 2px 0 0; -+ list-style: none; -+ background-color: #ffffff; -+ border: 1px solid #ccc; -+ border: 1px solid rgba(0, 0, 0, 0.2); -+ *border-right-width: 2px; -+ *border-bottom-width: 2px; -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ -webkit-background-clip: padding-box; -+ -moz-background-clip: padding; -+ background-clip: padding-box; -+} -+ -+.dropdown-menu.pull-right { -+ right: 0; -+ left: auto; -+} -+ -+.dropdown-menu .divider { -+ *width: 100%; -+ height: 1px; -+ margin: 9px 1px; -+ *margin: -5px 0 5px; -+ overflow: hidden; -+ background-color: #e5e5e5; -+ border-bottom: 1px solid #ffffff; -+} -+ -+.dropdown-menu > li > a { -+ display: block; -+ padding: 3px 20px; -+ clear: both; -+ font-weight: normal; -+ line-height: 20px; -+ color: #333333; -+ white-space: nowrap; -+} -+ -+.dropdown-menu > li > a:hover, -+.dropdown-menu > li > a:focus, -+.dropdown-submenu:hover > a, -+.dropdown-submenu:focus > a { -+ color: #ffffff; -+ text-decoration: none; -+ background-color: #0081c2; -+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); -+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); -+ background-image: -o-linear-gradient(top, #0088cc, #0077b3); -+ background-image: linear-gradient(to bottom, #0088cc, #0077b3); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -+} -+ -+.dropdown-menu > .active > a, -+.dropdown-menu > .active > a:hover, -+.dropdown-menu > .active > a:focus { -+ color: #ffffff; -+ text-decoration: none; -+ background-color: #0081c2; -+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); -+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); -+ background-image: -o-linear-gradient(top, #0088cc, #0077b3); -+ background-image: linear-gradient(to bottom, #0088cc, #0077b3); -+ background-repeat: repeat-x; -+ outline: 0; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -+} -+ -+.dropdown-menu > .disabled > a, -+.dropdown-menu > .disabled > a:hover, -+.dropdown-menu > .disabled > a:focus { -+ color: #999999; -+} -+ -+.dropdown-menu > .disabled > a:hover, -+.dropdown-menu > .disabled > a:focus { -+ text-decoration: none; -+ cursor: default; -+ background-color: transparent; -+ background-image: none; -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.open { -+ *z-index: 1000; -+} -+ -+.open > .dropdown-menu { -+ display: block; -+} -+ -+.pull-right > .dropdown-menu { -+ right: 0; -+ left: auto; -+} -+ -+.dropup .caret, -+.navbar-fixed-bottom .dropdown .caret { -+ border-top: 0; -+ border-bottom: 4px solid #000000; -+ content: ""; -+} -+ -+.dropup .dropdown-menu, -+.navbar-fixed-bottom .dropdown .dropdown-menu { -+ top: auto; -+ bottom: 100%; -+ margin-bottom: 1px; -+} -+ -+.dropdown-submenu { -+ position: relative; -+} -+ -+.dropdown-submenu > .dropdown-menu { -+ top: 0; -+ left: 100%; -+ margin-top: -6px; -+ margin-left: -1px; -+ -webkit-border-radius: 0 6px 6px 6px; -+ -moz-border-radius: 0 6px 6px 6px; -+ border-radius: 0 6px 6px 6px; -+} -+ -+.dropdown-submenu:hover > .dropdown-menu { -+ display: block; -+} -+ -+.dropup .dropdown-submenu > .dropdown-menu { -+ top: auto; -+ bottom: 0; -+ margin-top: 0; -+ margin-bottom: -2px; -+ -webkit-border-radius: 5px 5px 5px 0; -+ -moz-border-radius: 5px 5px 5px 0; -+ border-radius: 5px 5px 5px 0; -+} -+ -+.dropdown-submenu > a:after { -+ display: block; -+ float: right; -+ width: 0; -+ height: 0; -+ margin-top: 5px; -+ margin-right: -10px; -+ border-color: transparent; -+ border-left-color: #cccccc; -+ border-style: solid; -+ border-width: 5px 0 5px 5px; -+ content: " "; -+} -+ -+.dropdown-submenu:hover > a:after { -+ border-left-color: #ffffff; -+} -+ -+.dropdown-submenu.pull-left { -+ float: none; -+} -+ -+.dropdown-submenu.pull-left > .dropdown-menu { -+ left: -100%; -+ margin-left: 10px; -+ -webkit-border-radius: 6px 0 6px 6px; -+ -moz-border-radius: 6px 0 6px 6px; -+ border-radius: 6px 0 6px 6px; -+} -+ -+.dropdown .dropdown-menu .nav-header { -+ padding-right: 20px; -+ padding-left: 20px; -+} -+ -+.typeahead { -+ z-index: 1051; -+ margin-top: 2px; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.well { -+ min-height: 20px; -+ padding: 19px; -+ margin-bottom: 20px; -+ background-color: #f5f5f5; -+ border: 1px solid #e3e3e3; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -+} -+ -+.well blockquote { -+ border-color: #ddd; -+ border-color: rgba(0, 0, 0, 0.15); -+} -+ -+.well-large { -+ padding: 24px; -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+} -+ -+.well-small { -+ padding: 9px; -+ -webkit-border-radius: 3px; -+ -moz-border-radius: 3px; -+ border-radius: 3px; -+} -+ -+.fade { -+ opacity: 0; -+ -webkit-transition: opacity 0.15s linear; -+ -moz-transition: opacity 0.15s linear; -+ -o-transition: opacity 0.15s linear; -+ transition: opacity 0.15s linear; -+} -+ -+.fade.in { -+ opacity: 1; -+} -+ -+.collapse { -+ position: relative; -+ height: 0; -+ overflow: hidden; -+ -webkit-transition: height 0.35s ease; -+ -moz-transition: height 0.35s ease; -+ -o-transition: height 0.35s ease; -+ transition: height 0.35s ease; -+} -+ -+.collapse.in { -+ height: auto; -+} -+ -+.close { -+ float: right; -+ font-size: 20px; -+ font-weight: bold; -+ line-height: 20px; -+ color: #000000; -+ text-shadow: 0 1px 0 #ffffff; -+ opacity: 0.2; -+ filter: alpha(opacity=20); -+} -+ -+.close:hover, -+.close:focus { -+ color: #000000; -+ text-decoration: none; -+ cursor: pointer; -+ opacity: 0.4; -+ filter: alpha(opacity=40); -+} -+ -+button.close { -+ padding: 0; -+ cursor: pointer; -+ background: transparent; -+ border: 0; -+ -webkit-appearance: none; -+} -+ -+.btn { -+ display: inline-block; -+ *display: inline; -+ padding: 4px 12px; -+ margin-bottom: 0; -+ *margin-left: .3em; -+ font-size: 14px; -+ line-height: 20px; -+ color: #333333; -+ text-align: center; -+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -+ vertical-align: middle; -+ cursor: pointer; -+ background-color: #f5f5f5; -+ *background-color: #e6e6e6; -+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); -+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); -+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); -+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); -+ background-repeat: repeat-x; -+ border: 1px solid #cccccc; -+ *border: 0; -+ border-color: #e6e6e6 #e6e6e6 #bfbfbf; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ border-bottom-color: #b3b3b3; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+ *zoom: 1; -+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+} -+ -+.btn:hover, -+.btn:focus, -+.btn:active, -+.btn.active, -+.btn.disabled, -+.btn[disabled] { -+ color: #333333; -+ background-color: #e6e6e6; -+ *background-color: #d9d9d9; -+} -+ -+.btn:active, -+.btn.active { -+ background-color: #cccccc \9; -+} -+ -+.btn:first-child { -+ *margin-left: 0; -+} -+ -+.btn:hover, -+.btn:focus { -+ color: #333333; -+ text-decoration: none; -+ background-position: 0 -15px; -+ -webkit-transition: background-position 0.1s linear; -+ -moz-transition: background-position 0.1s linear; -+ -o-transition: background-position 0.1s linear; -+ transition: background-position 0.1s linear; -+} -+ -+.btn:focus { -+ outline: thin dotted #333; -+ outline: 5px auto -webkit-focus-ring-color; -+ outline-offset: -2px; -+} -+ -+.btn.active, -+.btn:active { -+ background-image: none; -+ outline: 0; -+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+} -+ -+.btn.disabled, -+.btn[disabled] { -+ cursor: default; -+ background-image: none; -+ opacity: 0.65; -+ filter: alpha(opacity=65); -+ -webkit-box-shadow: none; -+ -moz-box-shadow: none; -+ box-shadow: none; -+} -+ -+.btn-large { -+ padding: 11px 19px; -+ font-size: 17.5px; -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+} -+ -+.btn-large [class^="icon-"], -+.btn-large [class*=" icon-"] { -+ margin-top: 4px; -+} -+ -+.btn-small { -+ padding: 2px 10px; -+ font-size: 11.9px; -+ -webkit-border-radius: 3px; -+ -moz-border-radius: 3px; -+ border-radius: 3px; -+} -+ -+.btn-small [class^="icon-"], -+.btn-small [class*=" icon-"] { -+ margin-top: 0; -+} -+ -+.btn-mini [class^="icon-"], -+.btn-mini [class*=" icon-"] { -+ margin-top: -1px; -+} -+ -+.btn-mini { -+ padding: 0 6px; -+ font-size: 10.5px; -+ -webkit-border-radius: 3px; -+ -moz-border-radius: 3px; -+ border-radius: 3px; -+} -+ -+.btn-block { -+ display: block; -+ width: 100%; -+ padding-right: 0; -+ padding-left: 0; -+ -webkit-box-sizing: border-box; -+ -moz-box-sizing: border-box; -+ box-sizing: border-box; -+} -+ -+.btn-block + .btn-block { -+ margin-top: 5px; -+} -+ -+input[type="submit"].btn-block, -+input[type="reset"].btn-block, -+input[type="button"].btn-block { -+ width: 100%; -+} -+ -+.btn-primary.active, -+.btn-warning.active, -+.btn-danger.active, -+.btn-success.active, -+.btn-info.active, -+.btn-inverse.active { -+ color: rgba(255, 255, 255, 0.75); -+} -+ -+.btn-primary { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #006dcc; -+ *background-color: #0044cc; -+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); -+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); -+ background-image: -o-linear-gradient(top, #0088cc, #0044cc); -+ background-image: linear-gradient(to bottom, #0088cc, #0044cc); -+ background-repeat: repeat-x; -+ border-color: #0044cc #0044cc #002a80; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-primary:hover, -+.btn-primary:focus, -+.btn-primary:active, -+.btn-primary.active, -+.btn-primary.disabled, -+.btn-primary[disabled] { -+ color: #ffffff; -+ background-color: #0044cc; -+ *background-color: #003bb3; -+} -+ -+.btn-primary:active, -+.btn-primary.active { -+ background-color: #003399 \9; -+} -+ -+.btn-warning { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #faa732; -+ *background-color: #f89406; -+ background-image: -moz-linear-gradient(top, #fbb450, #f89406); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); -+ background-image: -webkit-linear-gradient(top, #fbb450, #f89406); -+ background-image: -o-linear-gradient(top, #fbb450, #f89406); -+ background-image: linear-gradient(to bottom, #fbb450, #f89406); -+ background-repeat: repeat-x; -+ border-color: #f89406 #f89406 #ad6704; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-warning:hover, -+.btn-warning:focus, -+.btn-warning:active, -+.btn-warning.active, -+.btn-warning.disabled, -+.btn-warning[disabled] { -+ color: #ffffff; -+ background-color: #f89406; -+ *background-color: #df8505; -+} -+ -+.btn-warning:active, -+.btn-warning.active { -+ background-color: #c67605 \9; -+} -+ -+.btn-danger { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #da4f49; -+ *background-color: #bd362f; -+ background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); -+ background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); -+ background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); -+ background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); -+ background-repeat: repeat-x; -+ border-color: #bd362f #bd362f #802420; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-danger:hover, -+.btn-danger:focus, -+.btn-danger:active, -+.btn-danger.active, -+.btn-danger.disabled, -+.btn-danger[disabled] { -+ color: #ffffff; -+ background-color: #bd362f; -+ *background-color: #a9302a; -+} -+ -+.btn-danger:active, -+.btn-danger.active { -+ background-color: #942a25 \9; -+} -+ -+.btn-success { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #5bb75b; -+ *background-color: #51a351; -+ background-image: -moz-linear-gradient(top, #62c462, #51a351); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); -+ background-image: -webkit-linear-gradient(top, #62c462, #51a351); -+ background-image: -o-linear-gradient(top, #62c462, #51a351); -+ background-image: linear-gradient(to bottom, #62c462, #51a351); -+ background-repeat: repeat-x; -+ border-color: #51a351 #51a351 #387038; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-success:hover, -+.btn-success:focus, -+.btn-success:active, -+.btn-success.active, -+.btn-success.disabled, -+.btn-success[disabled] { -+ color: #ffffff; -+ background-color: #51a351; -+ *background-color: #499249; -+} -+ -+.btn-success:active, -+.btn-success.active { -+ background-color: #408140 \9; -+} -+ -+.btn-info { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #49afcd; -+ *background-color: #2f96b4; -+ background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); -+ background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); -+ background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); -+ background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); -+ background-repeat: repeat-x; -+ border-color: #2f96b4 #2f96b4 #1f6377; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-info:hover, -+.btn-info:focus, -+.btn-info:active, -+.btn-info.active, -+.btn-info.disabled, -+.btn-info[disabled] { -+ color: #ffffff; -+ background-color: #2f96b4; -+ *background-color: #2a85a0; -+} -+ -+.btn-info:active, -+.btn-info.active { -+ background-color: #24748c \9; -+} -+ -+.btn-inverse { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #363636; -+ *background-color: #222222; -+ background-image: -moz-linear-gradient(top, #444444, #222222); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); -+ background-image: -webkit-linear-gradient(top, #444444, #222222); -+ background-image: -o-linear-gradient(top, #444444, #222222); -+ background-image: linear-gradient(to bottom, #444444, #222222); -+ background-repeat: repeat-x; -+ border-color: #222222 #222222 #000000; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.btn-inverse:hover, -+.btn-inverse:focus, -+.btn-inverse:active, -+.btn-inverse.active, -+.btn-inverse.disabled, -+.btn-inverse[disabled] { -+ color: #ffffff; -+ background-color: #222222; -+ *background-color: #151515; -+} -+ -+.btn-inverse:active, -+.btn-inverse.active { -+ background-color: #080808 \9; -+} -+ -+button.btn, -+input[type="submit"].btn { -+ *padding-top: 3px; -+ *padding-bottom: 3px; -+} -+ -+button.btn::-moz-focus-inner, -+input[type="submit"].btn::-moz-focus-inner { -+ padding: 0; -+ border: 0; -+} -+ -+button.btn.btn-large, -+input[type="submit"].btn.btn-large { -+ *padding-top: 7px; -+ *padding-bottom: 7px; -+} -+ -+button.btn.btn-small, -+input[type="submit"].btn.btn-small { -+ *padding-top: 3px; -+ *padding-bottom: 3px; -+} -+ -+button.btn.btn-mini, -+input[type="submit"].btn.btn-mini { -+ *padding-top: 1px; -+ *padding-bottom: 1px; -+} -+ -+.btn-link, -+.btn-link:active, -+.btn-link[disabled] { -+ background-color: transparent; -+ background-image: none; -+ -webkit-box-shadow: none; -+ -moz-box-shadow: none; -+ box-shadow: none; -+} -+ -+.btn-link { -+ color: #0088cc; -+ cursor: pointer; -+ border-color: transparent; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.btn-link:hover, -+.btn-link:focus { -+ color: #005580; -+ text-decoration: underline; -+ background-color: transparent; -+} -+ -+.btn-link[disabled]:hover, -+.btn-link[disabled]:focus { -+ color: #333333; -+ text-decoration: none; -+} -+ -+.btn-group { -+ position: relative; -+ display: inline-block; -+ *display: inline; -+ *margin-left: .3em; -+ font-size: 0; -+ white-space: nowrap; -+ vertical-align: middle; -+ *zoom: 1; -+} -+ -+.btn-group:first-child { -+ *margin-left: 0; -+} -+ -+.btn-group + .btn-group { -+ margin-left: 5px; -+} -+ -+.btn-toolbar { -+ margin-top: 10px; -+ margin-bottom: 10px; -+ font-size: 0; -+} -+ -+.btn-toolbar > .btn + .btn, -+.btn-toolbar > .btn-group + .btn, -+.btn-toolbar > .btn + .btn-group { -+ margin-left: 5px; -+} -+ -+.btn-group > .btn { -+ position: relative; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.btn-group > .btn + .btn { -+ margin-left: -1px; -+} -+ -+.btn-group > .btn, -+.btn-group > .dropdown-menu, -+.btn-group > .popover { -+ font-size: 14px; -+} -+ -+.btn-group > .btn-mini { -+ font-size: 10.5px; -+} -+ -+.btn-group > .btn-small { -+ font-size: 11.9px; -+} -+ -+.btn-group > .btn-large { -+ font-size: 17.5px; -+} -+ -+.btn-group > .btn:first-child { -+ margin-left: 0; -+ -webkit-border-bottom-left-radius: 4px; -+ border-bottom-left-radius: 4px; -+ -webkit-border-top-left-radius: 4px; -+ border-top-left-radius: 4px; -+ -moz-border-radius-bottomleft: 4px; -+ -moz-border-radius-topleft: 4px; -+} -+ -+.btn-group > .btn:last-child, -+.btn-group > .dropdown-toggle { -+ -webkit-border-top-right-radius: 4px; -+ border-top-right-radius: 4px; -+ -webkit-border-bottom-right-radius: 4px; -+ border-bottom-right-radius: 4px; -+ -moz-border-radius-topright: 4px; -+ -moz-border-radius-bottomright: 4px; -+} -+ -+.btn-group > .btn.large:first-child { -+ margin-left: 0; -+ -webkit-border-bottom-left-radius: 6px; -+ border-bottom-left-radius: 6px; -+ -webkit-border-top-left-radius: 6px; -+ border-top-left-radius: 6px; -+ -moz-border-radius-bottomleft: 6px; -+ -moz-border-radius-topleft: 6px; -+} -+ -+.btn-group > .btn.large:last-child, -+.btn-group > .large.dropdown-toggle { -+ -webkit-border-top-right-radius: 6px; -+ border-top-right-radius: 6px; -+ -webkit-border-bottom-right-radius: 6px; -+ border-bottom-right-radius: 6px; -+ -moz-border-radius-topright: 6px; -+ -moz-border-radius-bottomright: 6px; -+} -+ -+.btn-group > .btn:hover, -+.btn-group > .btn:focus, -+.btn-group > .btn:active, -+.btn-group > .btn.active { -+ z-index: 2; -+} -+ -+.btn-group .dropdown-toggle:active, -+.btn-group.open .dropdown-toggle { -+ outline: 0; -+} -+ -+.btn-group > .btn + .dropdown-toggle { -+ *padding-top: 5px; -+ padding-right: 8px; -+ *padding-bottom: 5px; -+ padding-left: 8px; -+ -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+ box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -+} -+ -+.btn-group > .btn-mini + .dropdown-toggle { -+ *padding-top: 2px; -+ padding-right: 5px; -+ *padding-bottom: 2px; -+ padding-left: 5px; -+} -+ -+.btn-group > .btn-small + .dropdown-toggle { -+ *padding-top: 5px; -+ *padding-bottom: 4px; -+} -+ -+.btn-group > .btn-large + .dropdown-toggle { -+ *padding-top: 7px; -+ padding-right: 12px; -+ *padding-bottom: 7px; -+ padding-left: 12px; -+} -+ -+.btn-group.open .dropdown-toggle { -+ background-image: none; -+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -+} -+ -+.btn-group.open .btn.dropdown-toggle { -+ background-color: #e6e6e6; -+} -+ -+.btn-group.open .btn-primary.dropdown-toggle { -+ background-color: #0044cc; -+} -+ -+.btn-group.open .btn-warning.dropdown-toggle { -+ background-color: #f89406; -+} -+ -+.btn-group.open .btn-danger.dropdown-toggle { -+ background-color: #bd362f; -+} -+ -+.btn-group.open .btn-success.dropdown-toggle { -+ background-color: #51a351; -+} -+ -+.btn-group.open .btn-info.dropdown-toggle { -+ background-color: #2f96b4; -+} -+ -+.btn-group.open .btn-inverse.dropdown-toggle { -+ background-color: #222222; -+} -+ -+.btn .caret { -+ margin-top: 8px; -+ margin-left: 0; -+} -+ -+.btn-large .caret { -+ margin-top: 6px; -+} -+ -+.btn-large .caret { -+ border-top-width: 5px; -+ border-right-width: 5px; -+ border-left-width: 5px; -+} -+ -+.btn-mini .caret, -+.btn-small .caret { -+ margin-top: 8px; -+} -+ -+.dropup .btn-large .caret { -+ border-bottom-width: 5px; -+} -+ -+.btn-primary .caret, -+.btn-warning .caret, -+.btn-danger .caret, -+.btn-info .caret, -+.btn-success .caret, -+.btn-inverse .caret { -+ border-top-color: #ffffff; -+ border-bottom-color: #ffffff; -+} -+ -+.btn-group-vertical { -+ display: inline-block; -+ *display: inline; -+ /* IE7 inline-block hack */ -+ -+ *zoom: 1; -+} -+ -+.btn-group-vertical > .btn { -+ display: block; -+ float: none; -+ max-width: 100%; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.btn-group-vertical > .btn + .btn { -+ margin-top: -1px; -+ margin-left: 0; -+} -+ -+.btn-group-vertical > .btn:first-child { -+ -webkit-border-radius: 4px 4px 0 0; -+ -moz-border-radius: 4px 4px 0 0; -+ border-radius: 4px 4px 0 0; -+} -+ -+.btn-group-vertical > .btn:last-child { -+ -webkit-border-radius: 0 0 4px 4px; -+ -moz-border-radius: 0 0 4px 4px; -+ border-radius: 0 0 4px 4px; -+} -+ -+.btn-group-vertical > .btn-large:first-child { -+ -webkit-border-radius: 6px 6px 0 0; -+ -moz-border-radius: 6px 6px 0 0; -+ border-radius: 6px 6px 0 0; -+} -+ -+.btn-group-vertical > .btn-large:last-child { -+ -webkit-border-radius: 0 0 6px 6px; -+ -moz-border-radius: 0 0 6px 6px; -+ border-radius: 0 0 6px 6px; -+} -+ -+.alert { -+ padding: 8px 35px 8px 14px; -+ margin-bottom: 20px; -+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -+ background-color: #fcf8e3; -+ border: 1px solid #fbeed5; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.alert, -+.alert h4 { -+ color: #c09853; -+} -+ -+.alert h4 { -+ margin: 0; -+} -+ -+.alert .close { -+ position: relative; -+ top: -2px; -+ right: -21px; -+ line-height: 20px; -+} -+ -+.alert-success { -+ color: #468847; -+ background-color: #dff0d8; -+ border-color: #d6e9c6; -+} -+ -+.alert-success h4 { -+ color: #468847; -+} -+ -+.alert-danger, -+.alert-error { -+ color: #b94a48; -+ background-color: #f2dede; -+ border-color: #eed3d7; -+} -+ -+.alert-danger h4, -+.alert-error h4 { -+ color: #b94a48; -+} -+ -+.alert-info { -+ color: #3a87ad; -+ background-color: #d9edf7; -+ border-color: #bce8f1; -+} -+ -+.alert-info h4 { -+ color: #3a87ad; -+} -+ -+.alert-block { -+ padding-top: 14px; -+ padding-bottom: 14px; -+} -+ -+.alert-block > p, -+.alert-block > ul { -+ margin-bottom: 0; -+} -+ -+.alert-block p + p { -+ margin-top: 5px; -+} -+ -+.nav { -+ margin-bottom: 20px; -+ margin-left: 0; -+ list-style: none; -+} -+ -+.nav > li > a { -+ display: block; -+} -+ -+.nav > li > a:hover, -+.nav > li > a:focus { -+ text-decoration: none; -+ background-color: #eeeeee; -+} -+ -+.nav > li > a > img { -+ max-width: none; -+} -+ -+.nav > .pull-right { -+ float: right; -+} -+ -+.nav-header { -+ display: block; -+ padding: 3px 15px; -+ font-size: 11px; -+ font-weight: bold; -+ line-height: 20px; -+ color: #999999; -+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -+ text-transform: uppercase; -+} -+ -+.nav li + .nav-header { -+ margin-top: 9px; -+} -+ -+.nav-list { -+ padding-right: 15px; -+ padding-left: 15px; -+ margin-bottom: 0; -+} -+ -+.nav-list > li > a, -+.nav-list .nav-header { -+ margin-right: -15px; -+ margin-left: -15px; -+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -+} -+ -+.nav-list > li > a { -+ padding: 3px 15px; -+} -+ -+.nav-list > .active > a, -+.nav-list > .active > a:hover, -+.nav-list > .active > a:focus { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); -+ background-color: #0088cc; -+} -+ -+.nav-list [class^="icon-"], -+.nav-list [class*=" icon-"] { -+ margin-right: 2px; -+} -+ -+.nav-list .divider { -+ *width: 100%; -+ height: 1px; -+ margin: 9px 1px; -+ *margin: -5px 0 5px; -+ overflow: hidden; -+ background-color: #e5e5e5; -+ border-bottom: 1px solid #ffffff; -+} -+ -+.nav-tabs, -+.nav-pills { -+ *zoom: 1; -+} -+ -+.nav-tabs:before, -+.nav-pills:before, -+.nav-tabs:after, -+.nav-pills:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.nav-tabs:after, -+.nav-pills:after { -+ clear: both; -+} -+ -+.nav-tabs > li, -+.nav-pills > li { -+ float: left; -+} -+ -+.nav-tabs > li > a, -+.nav-pills > li > a { -+ padding-right: 12px; -+ padding-left: 12px; -+ margin-right: 2px; -+ line-height: 14px; -+} -+ -+.nav-tabs { -+ border-bottom: 1px solid #ddd; -+} -+ -+.nav-tabs > li { -+ margin-bottom: -1px; -+} -+ -+.nav-tabs > li > a { -+ padding-top: 8px; -+ padding-bottom: 8px; -+ line-height: 20px; -+ border: 1px solid transparent; -+ -webkit-border-radius: 4px 4px 0 0; -+ -moz-border-radius: 4px 4px 0 0; -+ border-radius: 4px 4px 0 0; -+} -+ -+.nav-tabs > li > a:hover, -+.nav-tabs > li > a:focus { -+ border-color: #eeeeee #eeeeee #dddddd; -+} -+ -+.nav-tabs > .active > a, -+.nav-tabs > .active > a:hover, -+.nav-tabs > .active > a:focus { -+ color: #555555; -+ cursor: default; -+ background-color: #ffffff; -+ border: 1px solid #ddd; -+ border-bottom-color: transparent; -+} -+ -+.nav-pills > li > a { -+ padding-top: 8px; -+ padding-bottom: 8px; -+ margin-top: 2px; -+ margin-bottom: 2px; -+ -webkit-border-radius: 5px; -+ -moz-border-radius: 5px; -+ border-radius: 5px; -+} -+ -+.nav-pills > .active > a, -+.nav-pills > .active > a:hover, -+.nav-pills > .active > a:focus { -+ color: #ffffff; -+ background-color: #0088cc; -+} -+ -+.nav-stacked > li { -+ float: none; -+} -+ -+.nav-stacked > li > a { -+ margin-right: 0; -+} -+ -+.nav-tabs.nav-stacked { -+ border-bottom: 0; -+} -+ -+.nav-tabs.nav-stacked > li > a { -+ border: 1px solid #ddd; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.nav-tabs.nav-stacked > li:first-child > a { -+ -webkit-border-top-right-radius: 4px; -+ border-top-right-radius: 4px; -+ -webkit-border-top-left-radius: 4px; -+ border-top-left-radius: 4px; -+ -moz-border-radius-topright: 4px; -+ -moz-border-radius-topleft: 4px; -+} -+ -+.nav-tabs.nav-stacked > li:last-child > a { -+ -webkit-border-bottom-right-radius: 4px; -+ border-bottom-right-radius: 4px; -+ -webkit-border-bottom-left-radius: 4px; -+ border-bottom-left-radius: 4px; -+ -moz-border-radius-bottomright: 4px; -+ -moz-border-radius-bottomleft: 4px; -+} -+ -+.nav-tabs.nav-stacked > li > a:hover, -+.nav-tabs.nav-stacked > li > a:focus { -+ z-index: 2; -+ border-color: #ddd; -+} -+ -+.nav-pills.nav-stacked > li > a { -+ margin-bottom: 3px; -+} -+ -+.nav-pills.nav-stacked > li:last-child > a { -+ margin-bottom: 1px; -+} -+ -+.nav-tabs .dropdown-menu { -+ -webkit-border-radius: 0 0 6px 6px; -+ -moz-border-radius: 0 0 6px 6px; -+ border-radius: 0 0 6px 6px; -+} -+ -+.nav-pills .dropdown-menu { -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+} -+ -+.nav .dropdown-toggle .caret { -+ margin-top: 6px; -+ border-top-color: #0088cc; -+ border-bottom-color: #0088cc; -+} -+ -+.nav .dropdown-toggle:hover .caret, -+.nav .dropdown-toggle:focus .caret { -+ border-top-color: #005580; -+ border-bottom-color: #005580; -+} -+ -+/* move down carets for tabs */ -+ -+.nav-tabs .dropdown-toggle .caret { -+ margin-top: 8px; -+} -+ -+.nav .active .dropdown-toggle .caret { -+ border-top-color: #fff; -+ border-bottom-color: #fff; -+} -+ -+.nav-tabs .active .dropdown-toggle .caret { -+ border-top-color: #555555; -+ border-bottom-color: #555555; -+} -+ -+.nav > .dropdown.active > a:hover, -+.nav > .dropdown.active > a:focus { -+ cursor: pointer; -+} -+ -+.nav-tabs .open .dropdown-toggle, -+.nav-pills .open .dropdown-toggle, -+.nav > li.dropdown.open.active > a:hover, -+.nav > li.dropdown.open.active > a:focus { -+ color: #ffffff; -+ background-color: #999999; -+ border-color: #999999; -+} -+ -+.nav li.dropdown.open .caret, -+.nav li.dropdown.open.active .caret, -+.nav li.dropdown.open a:hover .caret, -+.nav li.dropdown.open a:focus .caret { -+ border-top-color: #ffffff; -+ border-bottom-color: #ffffff; -+ opacity: 1; -+ filter: alpha(opacity=100); -+} -+ -+.tabs-stacked .open > a:hover, -+.tabs-stacked .open > a:focus { -+ border-color: #999999; -+} -+ -+.tabbable { -+ *zoom: 1; -+} -+ -+.tabbable:before, -+.tabbable:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.tabbable:after { -+ clear: both; -+} -+ -+.tab-content { -+ overflow: auto; -+} -+ -+.tabs-below > .nav-tabs, -+.tabs-right > .nav-tabs, -+.tabs-left > .nav-tabs { -+ border-bottom: 0; -+} -+ -+.tab-content > .tab-pane, -+.pill-content > .pill-pane { -+ display: none; -+} -+ -+.tab-content > .active, -+.pill-content > .active { -+ display: block; -+} -+ -+.tabs-below > .nav-tabs { -+ border-top: 1px solid #ddd; -+} -+ -+.tabs-below > .nav-tabs > li { -+ margin-top: -1px; -+ margin-bottom: 0; -+} -+ -+.tabs-below > .nav-tabs > li > a { -+ -webkit-border-radius: 0 0 4px 4px; -+ -moz-border-radius: 0 0 4px 4px; -+ border-radius: 0 0 4px 4px; -+} -+ -+.tabs-below > .nav-tabs > li > a:hover, -+.tabs-below > .nav-tabs > li > a:focus { -+ border-top-color: #ddd; -+ border-bottom-color: transparent; -+} -+ -+.tabs-below > .nav-tabs > .active > a, -+.tabs-below > .nav-tabs > .active > a:hover, -+.tabs-below > .nav-tabs > .active > a:focus { -+ border-color: transparent #ddd #ddd #ddd; -+} -+ -+.tabs-left > .nav-tabs > li, -+.tabs-right > .nav-tabs > li { -+ float: none; -+} -+ -+.tabs-left > .nav-tabs > li > a, -+.tabs-right > .nav-tabs > li > a { -+ min-width: 74px; -+ margin-right: 0; -+ margin-bottom: 3px; -+} -+ -+.tabs-left > .nav-tabs { -+ float: left; -+ margin-right: 19px; -+ border-right: 1px solid #ddd; -+} -+ -+.tabs-left > .nav-tabs > li > a { -+ margin-right: -1px; -+ -webkit-border-radius: 4px 0 0 4px; -+ -moz-border-radius: 4px 0 0 4px; -+ border-radius: 4px 0 0 4px; -+} -+ -+.tabs-left > .nav-tabs > li > a:hover, -+.tabs-left > .nav-tabs > li > a:focus { -+ border-color: #eeeeee #dddddd #eeeeee #eeeeee; -+} -+ -+.tabs-left > .nav-tabs .active > a, -+.tabs-left > .nav-tabs .active > a:hover, -+.tabs-left > .nav-tabs .active > a:focus { -+ border-color: #ddd transparent #ddd #ddd; -+ *border-right-color: #ffffff; -+} -+ -+.tabs-right > .nav-tabs { -+ float: right; -+ margin-left: 19px; -+ border-left: 1px solid #ddd; -+} -+ -+.tabs-right > .nav-tabs > li > a { -+ margin-left: -1px; -+ -webkit-border-radius: 0 4px 4px 0; -+ -moz-border-radius: 0 4px 4px 0; -+ border-radius: 0 4px 4px 0; -+} -+ -+.tabs-right > .nav-tabs > li > a:hover, -+.tabs-right > .nav-tabs > li > a:focus { -+ border-color: #eeeeee #eeeeee #eeeeee #dddddd; -+} -+ -+.tabs-right > .nav-tabs .active > a, -+.tabs-right > .nav-tabs .active > a:hover, -+.tabs-right > .nav-tabs .active > a:focus { -+ border-color: #ddd #ddd #ddd transparent; -+ *border-left-color: #ffffff; -+} -+ -+.nav > .disabled > a { -+ color: #999999; -+} -+ -+.nav > .disabled > a:hover, -+.nav > .disabled > a:focus { -+ text-decoration: none; -+ cursor: default; -+ background-color: transparent; -+} -+ -+.navbar { -+ *position: relative; -+ *z-index: 2; -+ margin-bottom: 20px; -+ overflow: visible; -+} -+ -+.navbar-inner { -+ min-height: 40px; -+ padding-right: 20px; -+ padding-left: 20px; -+ background-color: #fafafa; -+ background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); -+ background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); -+ background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); -+ background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); -+ background-repeat: repeat-x; -+ border: 1px solid #d4d4d4; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); -+ *zoom: 1; -+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -+} -+ -+.navbar-inner:before, -+.navbar-inner:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.navbar-inner:after { -+ clear: both; -+} -+ -+.navbar .container { -+ width: auto; -+} -+ -+.nav-collapse.collapse { -+ height: auto; -+ overflow: visible; -+} -+ -+.navbar .brand { -+ display: block; -+ float: left; -+ padding: 10px 20px 10px; -+ margin-left: -20px; -+ font-size: 20px; -+ font-weight: 200; -+ color: #777777; -+ text-shadow: 0 1px 0 #ffffff; -+} -+ -+.navbar .brand:hover, -+.navbar .brand:focus { -+ text-decoration: none; -+} -+ -+.navbar-text { -+ margin-bottom: 0; -+ line-height: 40px; -+ color: #777777; -+} -+ -+.navbar-link { -+ color: #777777; -+} -+ -+.navbar-link:hover, -+.navbar-link:focus { -+ color: #333333; -+} -+ -+.navbar .divider-vertical { -+ height: 40px; -+ margin: 0 9px; -+ border-right: 1px solid #ffffff; -+ border-left: 1px solid #f2f2f2; -+} -+ -+.navbar .btn, -+.navbar .btn-group { -+ margin-top: 5px; -+} -+ -+.navbar .btn-group .btn, -+.navbar .input-prepend .btn, -+.navbar .input-append .btn, -+.navbar .input-prepend .btn-group, -+.navbar .input-append .btn-group { -+ margin-top: 0; -+} -+ -+.navbar-form { -+ margin-bottom: 0; -+ *zoom: 1; -+} -+ -+.navbar-form:before, -+.navbar-form:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.navbar-form:after { -+ clear: both; -+} -+ -+.navbar-form input, -+.navbar-form select, -+.navbar-form .radio, -+.navbar-form .checkbox { -+ margin-top: 5px; -+} -+ -+.navbar-form input, -+.navbar-form select, -+.navbar-form .btn { -+ display: inline-block; -+ margin-bottom: 0; -+} -+ -+.navbar-form input[type="image"], -+.navbar-form input[type="checkbox"], -+.navbar-form input[type="radio"] { -+ margin-top: 3px; -+} -+ -+.navbar-form .input-append, -+.navbar-form .input-prepend { -+ margin-top: 5px; -+ white-space: nowrap; -+} -+ -+.navbar-form .input-append input, -+.navbar-form .input-prepend input { -+ margin-top: 0; -+} -+ -+.navbar-search { -+ position: relative; -+ float: left; -+ margin-top: 5px; -+ margin-bottom: 0; -+} -+ -+.navbar-search .search-query { -+ padding: 4px 14px; -+ margin-bottom: 0; -+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -+ font-size: 13px; -+ font-weight: normal; -+ line-height: 1; -+ -webkit-border-radius: 15px; -+ -moz-border-radius: 15px; -+ border-radius: 15px; -+} -+ -+.navbar-static-top { -+ position: static; -+ margin-bottom: 0; -+} -+ -+.navbar-static-top .navbar-inner { -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.navbar-fixed-top, -+.navbar-fixed-bottom { -+ position: fixed; -+ right: 0; -+ left: 0; -+ z-index: 1030; -+ margin-bottom: 0; -+} -+ -+.navbar-fixed-top .navbar-inner, -+.navbar-static-top .navbar-inner { -+ border-width: 0 0 1px; -+} -+ -+.navbar-fixed-bottom .navbar-inner { -+ border-width: 1px 0 0; -+} -+ -+.navbar-fixed-top .navbar-inner, -+.navbar-fixed-bottom .navbar-inner { -+ padding-right: 0; -+ padding-left: 0; -+ -webkit-border-radius: 0; -+ -moz-border-radius: 0; -+ border-radius: 0; -+} -+ -+.navbar-static-top .container, -+.navbar-fixed-top .container, -+.navbar-fixed-bottom .container { -+ width: 940px; -+} -+ -+.navbar-fixed-top { -+ top: 0; -+} -+ -+.navbar-fixed-top .navbar-inner, -+.navbar-static-top .navbar-inner { -+ -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -+ -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -+ box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -+} -+ -+.navbar-fixed-bottom { -+ bottom: 0; -+} -+ -+.navbar-fixed-bottom .navbar-inner { -+ -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -+ -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -+ box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -+} -+ -+.navbar .nav { -+ position: relative; -+ left: 0; -+ display: block; -+ float: left; -+ margin: 0 10px 0 0; -+} -+ -+.navbar .nav.pull-right { -+ float: right; -+ margin-right: 0; -+} -+ -+.navbar .nav > li { -+ float: left; -+} -+ -+.navbar .nav > li > a { -+ float: none; -+ padding: 10px 15px 10px; -+ color: #777777; -+ text-decoration: none; -+ text-shadow: 0 1px 0 #ffffff; -+} -+ -+.navbar .nav .dropdown-toggle .caret { -+ margin-top: 8px; -+} -+ -+.navbar .nav > li > a:focus, -+.navbar .nav > li > a:hover { -+ color: #333333; -+ text-decoration: none; -+ background-color: transparent; -+} -+ -+.navbar .nav > .active > a, -+.navbar .nav > .active > a:hover, -+.navbar .nav > .active > a:focus { -+ color: #555555; -+ text-decoration: none; -+ background-color: #e5e5e5; -+ -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -+ -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -+ box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -+} -+ -+.navbar .btn-navbar { -+ display: none; -+ float: right; -+ padding: 7px 10px; -+ margin-right: 5px; -+ margin-left: 5px; -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #ededed; -+ *background-color: #e5e5e5; -+ background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); -+ background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); -+ background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); -+ background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); -+ background-repeat: repeat-x; -+ border-color: #e5e5e5 #e5e5e5 #bfbfbf; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -+} -+ -+.navbar .btn-navbar:hover, -+.navbar .btn-navbar:focus, -+.navbar .btn-navbar:active, -+.navbar .btn-navbar.active, -+.navbar .btn-navbar.disabled, -+.navbar .btn-navbar[disabled] { -+ color: #ffffff; -+ background-color: #e5e5e5; -+ *background-color: #d9d9d9; -+} -+ -+.navbar .btn-navbar:active, -+.navbar .btn-navbar.active { -+ background-color: #cccccc \9; -+} -+ -+.navbar .btn-navbar .icon-bar { -+ display: block; -+ width: 18px; -+ height: 2px; -+ background-color: #f5f5f5; -+ -webkit-border-radius: 1px; -+ -moz-border-radius: 1px; -+ border-radius: 1px; -+ -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -+ -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -+ box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -+} -+ -+.btn-navbar .icon-bar + .icon-bar { -+ margin-top: 3px; -+} -+ -+.navbar .nav > li > .dropdown-menu:before { -+ position: absolute; -+ top: -7px; -+ left: 9px; -+ display: inline-block; -+ border-right: 7px solid transparent; -+ border-bottom: 7px solid #ccc; -+ border-left: 7px solid transparent; -+ border-bottom-color: rgba(0, 0, 0, 0.2); -+ content: ''; -+} -+ -+.navbar .nav > li > .dropdown-menu:after { -+ position: absolute; -+ top: -6px; -+ left: 10px; -+ display: inline-block; -+ border-right: 6px solid transparent; -+ border-bottom: 6px solid #ffffff; -+ border-left: 6px solid transparent; -+ content: ''; -+} -+ -+.navbar-fixed-bottom .nav > li > .dropdown-menu:before { -+ top: auto; -+ bottom: -7px; -+ border-top: 7px solid #ccc; -+ border-bottom: 0; -+ border-top-color: rgba(0, 0, 0, 0.2); -+} -+ -+.navbar-fixed-bottom .nav > li > .dropdown-menu:after { -+ top: auto; -+ bottom: -6px; -+ border-top: 6px solid #ffffff; -+ border-bottom: 0; -+} -+ -+.navbar .nav li.dropdown > a:hover .caret, -+.navbar .nav li.dropdown > a:focus .caret { -+ border-top-color: #333333; -+ border-bottom-color: #333333; -+} -+ -+.navbar .nav li.dropdown.open > .dropdown-toggle, -+.navbar .nav li.dropdown.active > .dropdown-toggle, -+.navbar .nav li.dropdown.open.active > .dropdown-toggle { -+ color: #555555; -+ background-color: #e5e5e5; -+} -+ -+.navbar .nav li.dropdown > .dropdown-toggle .caret { -+ border-top-color: #777777; -+ border-bottom-color: #777777; -+} -+ -+.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -+.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { -+ border-top-color: #555555; -+ border-bottom-color: #555555; -+} -+ -+.navbar .pull-right > li > .dropdown-menu, -+.navbar .nav > li > .dropdown-menu.pull-right { -+ right: 0; -+ left: auto; -+} -+ -+.navbar .pull-right > li > .dropdown-menu:before, -+.navbar .nav > li > .dropdown-menu.pull-right:before { -+ right: 12px; -+ left: auto; -+} -+ -+.navbar .pull-right > li > .dropdown-menu:after, -+.navbar .nav > li > .dropdown-menu.pull-right:after { -+ right: 13px; -+ left: auto; -+} -+ -+.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { -+ right: 100%; -+ left: auto; -+ margin-right: -1px; -+ margin-left: 0; -+ -webkit-border-radius: 6px 0 6px 6px; -+ -moz-border-radius: 6px 0 6px 6px; -+ border-radius: 6px 0 6px 6px; -+} -+ -+.navbar-inverse .navbar-inner { -+ background-color: #1b1b1b; -+ background-image: -moz-linear-gradient(top, #222222, #111111); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); -+ background-image: -webkit-linear-gradient(top, #222222, #111111); -+ background-image: -o-linear-gradient(top, #222222, #111111); -+ background-image: linear-gradient(to bottom, #222222, #111111); -+ background-repeat: repeat-x; -+ border-color: #252525; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -+} -+ -+.navbar-inverse .brand, -+.navbar-inverse .nav > li > a { -+ color: #999999; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+} -+ -+.navbar-inverse .brand:hover, -+.navbar-inverse .nav > li > a:hover, -+.navbar-inverse .brand:focus, -+.navbar-inverse .nav > li > a:focus { -+ color: #ffffff; -+} -+ -+.navbar-inverse .brand { -+ color: #999999; -+} -+ -+.navbar-inverse .navbar-text { -+ color: #999999; -+} -+ -+.navbar-inverse .nav > li > a:focus, -+.navbar-inverse .nav > li > a:hover { -+ color: #ffffff; -+ background-color: transparent; -+} -+ -+.navbar-inverse .nav .active > a, -+.navbar-inverse .nav .active > a:hover, -+.navbar-inverse .nav .active > a:focus { -+ color: #ffffff; -+ background-color: #111111; -+} -+ -+.navbar-inverse .navbar-link { -+ color: #999999; -+} -+ -+.navbar-inverse .navbar-link:hover, -+.navbar-inverse .navbar-link:focus { -+ color: #ffffff; -+} -+ -+.navbar-inverse .divider-vertical { -+ border-right-color: #222222; -+ border-left-color: #111111; -+} -+ -+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { -+ color: #ffffff; -+ background-color: #111111; -+} -+ -+.navbar-inverse .nav li.dropdown > a:hover .caret, -+.navbar-inverse .nav li.dropdown > a:focus .caret { -+ border-top-color: #ffffff; -+ border-bottom-color: #ffffff; -+} -+ -+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { -+ border-top-color: #999999; -+ border-bottom-color: #999999; -+} -+ -+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { -+ border-top-color: #ffffff; -+ border-bottom-color: #ffffff; -+} -+ -+.navbar-inverse .navbar-search .search-query { -+ color: #ffffff; -+ background-color: #515151; -+ border-color: #111111; -+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -+ -webkit-transition: none; -+ -moz-transition: none; -+ -o-transition: none; -+ transition: none; -+} -+ -+.navbar-inverse .navbar-search .search-query:-moz-placeholder { -+ color: #cccccc; -+} -+ -+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { -+ color: #cccccc; -+} -+ -+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { -+ color: #cccccc; -+} -+ -+.navbar-inverse .navbar-search .search-query:focus, -+.navbar-inverse .navbar-search .search-query.focused { -+ padding: 5px 15px; -+ color: #333333; -+ text-shadow: 0 1px 0 #ffffff; -+ background-color: #ffffff; -+ border: 0; -+ outline: 0; -+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -+} -+ -+.navbar-inverse .btn-navbar { -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #0e0e0e; -+ *background-color: #040404; -+ background-image: -moz-linear-gradient(top, #151515, #040404); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); -+ background-image: -webkit-linear-gradient(top, #151515, #040404); -+ background-image: -o-linear-gradient(top, #151515, #040404); -+ background-image: linear-gradient(to bottom, #151515, #040404); -+ background-repeat: repeat-x; -+ border-color: #040404 #040404 #000000; -+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); -+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -+} -+ -+.navbar-inverse .btn-navbar:hover, -+.navbar-inverse .btn-navbar:focus, -+.navbar-inverse .btn-navbar:active, -+.navbar-inverse .btn-navbar.active, -+.navbar-inverse .btn-navbar.disabled, -+.navbar-inverse .btn-navbar[disabled] { -+ color: #ffffff; -+ background-color: #040404; -+ *background-color: #000000; -+} -+ -+.navbar-inverse .btn-navbar:active, -+.navbar-inverse .btn-navbar.active { -+ background-color: #000000 \9; -+} -+ -+.breadcrumb { -+ padding: 8px 15px; -+ margin: 0 0 20px; -+ list-style: none; -+ background-color: #f5f5f5; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.breadcrumb > li { -+ display: inline-block; -+ *display: inline; -+ text-shadow: 0 1px 0 #ffffff; -+ *zoom: 1; -+} -+ -+.breadcrumb > li > .divider { -+ padding: 0 5px; -+ color: #ccc; -+} -+ -+.breadcrumb > .active { -+ color: #999999; -+} -+ -+.pagination { -+ margin: 20px 0; -+} -+ -+.pagination ul { -+ display: inline-block; -+ *display: inline; -+ margin-bottom: 0; -+ margin-left: 0; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ *zoom: 1; -+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -+ -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -+} -+ -+.pagination ul > li { -+ display: inline; -+} -+ -+.pagination ul > li > a, -+.pagination ul > li > span { -+ float: left; -+ padding: 4px 12px; -+ line-height: 20px; -+ text-decoration: none; -+ background-color: #ffffff; -+ border: 1px solid #dddddd; -+ border-left-width: 0; -+} -+ -+.pagination ul > li > a:hover, -+.pagination ul > li > a:focus, -+.pagination ul > .active > a, -+.pagination ul > .active > span { -+ background-color: #f5f5f5; -+} -+ -+.pagination ul > .active > a, -+.pagination ul > .active > span { -+ color: #999999; -+ cursor: default; -+} -+ -+.pagination ul > .disabled > span, -+.pagination ul > .disabled > a, -+.pagination ul > .disabled > a:hover, -+.pagination ul > .disabled > a:focus { -+ color: #999999; -+ cursor: default; -+ background-color: transparent; -+} -+ -+.pagination ul > li:first-child > a, -+.pagination ul > li:first-child > span { -+ border-left-width: 1px; -+ -webkit-border-bottom-left-radius: 4px; -+ border-bottom-left-radius: 4px; -+ -webkit-border-top-left-radius: 4px; -+ border-top-left-radius: 4px; -+ -moz-border-radius-bottomleft: 4px; -+ -moz-border-radius-topleft: 4px; -+} -+ -+.pagination ul > li:last-child > a, -+.pagination ul > li:last-child > span { -+ -webkit-border-top-right-radius: 4px; -+ border-top-right-radius: 4px; -+ -webkit-border-bottom-right-radius: 4px; -+ border-bottom-right-radius: 4px; -+ -moz-border-radius-topright: 4px; -+ -moz-border-radius-bottomright: 4px; -+} -+ -+.pagination-centered { -+ text-align: center; -+} -+ -+.pagination-right { -+ text-align: right; -+} -+ -+.pagination-large ul > li > a, -+.pagination-large ul > li > span { -+ padding: 11px 19px; -+ font-size: 17.5px; -+} -+ -+.pagination-large ul > li:first-child > a, -+.pagination-large ul > li:first-child > span { -+ -webkit-border-bottom-left-radius: 6px; -+ border-bottom-left-radius: 6px; -+ -webkit-border-top-left-radius: 6px; -+ border-top-left-radius: 6px; -+ -moz-border-radius-bottomleft: 6px; -+ -moz-border-radius-topleft: 6px; -+} -+ -+.pagination-large ul > li:last-child > a, -+.pagination-large ul > li:last-child > span { -+ -webkit-border-top-right-radius: 6px; -+ border-top-right-radius: 6px; -+ -webkit-border-bottom-right-radius: 6px; -+ border-bottom-right-radius: 6px; -+ -moz-border-radius-topright: 6px; -+ -moz-border-radius-bottomright: 6px; -+} -+ -+.pagination-mini ul > li:first-child > a, -+.pagination-small ul > li:first-child > a, -+.pagination-mini ul > li:first-child > span, -+.pagination-small ul > li:first-child > span { -+ -webkit-border-bottom-left-radius: 3px; -+ border-bottom-left-radius: 3px; -+ -webkit-border-top-left-radius: 3px; -+ border-top-left-radius: 3px; -+ -moz-border-radius-bottomleft: 3px; -+ -moz-border-radius-topleft: 3px; -+} -+ -+.pagination-mini ul > li:last-child > a, -+.pagination-small ul > li:last-child > a, -+.pagination-mini ul > li:last-child > span, -+.pagination-small ul > li:last-child > span { -+ -webkit-border-top-right-radius: 3px; -+ border-top-right-radius: 3px; -+ -webkit-border-bottom-right-radius: 3px; -+ border-bottom-right-radius: 3px; -+ -moz-border-radius-topright: 3px; -+ -moz-border-radius-bottomright: 3px; -+} -+ -+.pagination-small ul > li > a, -+.pagination-small ul > li > span { -+ padding: 2px 10px; -+ font-size: 11.9px; -+} -+ -+.pagination-mini ul > li > a, -+.pagination-mini ul > li > span { -+ padding: 0 6px; -+ font-size: 10.5px; -+} -+ -+.pager { -+ margin: 20px 0; -+ text-align: center; -+ list-style: none; -+ *zoom: 1; -+} -+ -+.pager:before, -+.pager:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.pager:after { -+ clear: both; -+} -+ -+.pager li { -+ display: inline; -+} -+ -+.pager li > a, -+.pager li > span { -+ display: inline-block; -+ padding: 5px 14px; -+ background-color: #fff; -+ border: 1px solid #ddd; -+ -webkit-border-radius: 15px; -+ -moz-border-radius: 15px; -+ border-radius: 15px; -+} -+ -+.pager li > a:hover, -+.pager li > a:focus { -+ text-decoration: none; -+ background-color: #f5f5f5; -+} -+ -+.pager .next > a, -+.pager .next > span { -+ float: right; -+} -+ -+.pager .previous > a, -+.pager .previous > span { -+ float: left; -+} -+ -+.pager .disabled > a, -+.pager .disabled > a:hover, -+.pager .disabled > a:focus, -+.pager .disabled > span { -+ color: #999999; -+ cursor: default; -+ background-color: #fff; -+} -+ -+.modal-backdrop { -+ position: fixed; -+ top: 0; -+ right: 0; -+ bottom: 0; -+ left: 0; -+ z-index: 1040; -+ background-color: #000000; -+} -+ -+.modal-backdrop.fade { -+ opacity: 0; -+} -+ -+.modal-backdrop, -+.modal-backdrop.fade.in { -+ opacity: 0.8; -+ filter: alpha(opacity=80); -+} -+ -+.modal { -+ position: fixed; -+ top: 10%; -+ left: 50%; -+ z-index: 1050; -+ width: 560px; -+ margin-left: -280px; -+ background-color: #ffffff; -+ border: 1px solid #999; -+ border: 1px solid rgba(0, 0, 0, 0.3); -+ *border: 1px solid #999; -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+ outline: none; -+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -+ -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -+ -webkit-background-clip: padding-box; -+ -moz-background-clip: padding-box; -+ background-clip: padding-box; -+} -+ -+.modal.fade { -+ top: -25%; -+ -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; -+ -moz-transition: opacity 0.3s linear, top 0.3s ease-out; -+ -o-transition: opacity 0.3s linear, top 0.3s ease-out; -+ transition: opacity 0.3s linear, top 0.3s ease-out; -+} -+ -+.modal.fade.in { -+ top: 10%; -+} -+ -+.modal-header { -+ padding: 9px 15px; -+ border-bottom: 1px solid #eee; -+} -+ -+.modal-header .close { -+ margin-top: 2px; -+} -+ -+.modal-header h3 { -+ margin: 0; -+ line-height: 30px; -+} -+ -+.modal-body { -+ position: relative; -+ max-height: 400px; -+ padding: 15px; -+ overflow-y: auto; -+} -+ -+.modal-form { -+ margin-bottom: 0; -+} -+ -+.modal-footer { -+ padding: 14px 15px 15px; -+ margin-bottom: 0; -+ text-align: right; -+ background-color: #f5f5f5; -+ border-top: 1px solid #ddd; -+ -webkit-border-radius: 0 0 6px 6px; -+ -moz-border-radius: 0 0 6px 6px; -+ border-radius: 0 0 6px 6px; -+ *zoom: 1; -+ -webkit-box-shadow: inset 0 1px 0 #ffffff; -+ -moz-box-shadow: inset 0 1px 0 #ffffff; -+ box-shadow: inset 0 1px 0 #ffffff; -+} -+ -+.modal-footer:before, -+.modal-footer:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.modal-footer:after { -+ clear: both; -+} -+ -+.modal-footer .btn + .btn { -+ margin-bottom: 0; -+ margin-left: 5px; -+} -+ -+.modal-footer .btn-group .btn + .btn { -+ margin-left: -1px; -+} -+ -+.modal-footer .btn-block + .btn-block { -+ margin-left: 0; -+} -+ -+.tooltip { -+ position: absolute; -+ z-index: 1030; -+ display: block; -+ font-size: 11px; -+ line-height: 1.4; -+ opacity: 0; -+ filter: alpha(opacity=0); -+ visibility: visible; -+} -+ -+.tooltip.in { -+ opacity: 0.8; -+ filter: alpha(opacity=80); -+} -+ -+.tooltip.top { -+ padding: 5px 0; -+ margin-top: -3px; -+} -+ -+.tooltip.right { -+ padding: 0 5px; -+ margin-left: 3px; -+} -+ -+.tooltip.bottom { -+ padding: 5px 0; -+ margin-top: 3px; -+} -+ -+.tooltip.left { -+ padding: 0 5px; -+ margin-left: -3px; -+} -+ -+.tooltip-inner { -+ max-width: 200px; -+ padding: 8px; -+ color: #ffffff; -+ text-align: center; -+ text-decoration: none; -+ background-color: #000000; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.tooltip-arrow { -+ position: absolute; -+ width: 0; -+ height: 0; -+ border-color: transparent; -+ border-style: solid; -+} -+ -+.tooltip.top .tooltip-arrow { -+ bottom: 0; -+ left: 50%; -+ margin-left: -5px; -+ border-top-color: #000000; -+ border-width: 5px 5px 0; -+} -+ -+.tooltip.right .tooltip-arrow { -+ top: 50%; -+ left: 0; -+ margin-top: -5px; -+ border-right-color: #000000; -+ border-width: 5px 5px 5px 0; -+} -+ -+.tooltip.left .tooltip-arrow { -+ top: 50%; -+ right: 0; -+ margin-top: -5px; -+ border-left-color: #000000; -+ border-width: 5px 0 5px 5px; -+} -+ -+.tooltip.bottom .tooltip-arrow { -+ top: 0; -+ left: 50%; -+ margin-left: -5px; -+ border-bottom-color: #000000; -+ border-width: 0 5px 5px; -+} -+ -+.popover { -+ position: absolute; -+ top: 0; -+ left: 0; -+ z-index: 1010; -+ display: none; -+ max-width: 276px; -+ padding: 1px; -+ text-align: left; -+ white-space: normal; -+ background-color: #ffffff; -+ border: 1px solid #ccc; -+ border: 1px solid rgba(0, 0, 0, 0.2); -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -+ -webkit-background-clip: padding-box; -+ -moz-background-clip: padding; -+ background-clip: padding-box; -+} -+ -+.popover.top { -+ margin-top: -10px; -+} -+ -+.popover.right { -+ margin-left: 10px; -+} -+ -+.popover.bottom { -+ margin-top: 10px; -+} -+ -+.popover.left { -+ margin-left: -10px; -+} -+ -+.popover-title { -+ padding: 8px 14px; -+ margin: 0; -+ font-size: 14px; -+ font-weight: normal; -+ line-height: 18px; -+ background-color: #f7f7f7; -+ border-bottom: 1px solid #ebebeb; -+ -webkit-border-radius: 5px 5px 0 0; -+ -moz-border-radius: 5px 5px 0 0; -+ border-radius: 5px 5px 0 0; -+} -+ -+.popover-title:empty { -+ display: none; -+} -+ -+.popover-content { -+ padding: 9px 14px; -+} -+ -+.popover .arrow, -+.popover .arrow:after { -+ position: absolute; -+ display: block; -+ width: 0; -+ height: 0; -+ border-color: transparent; -+ border-style: solid; -+} -+ -+.popover .arrow { -+ border-width: 11px; -+} -+ -+.popover .arrow:after { -+ border-width: 10px; -+ content: ""; -+} -+ -+.popover.top .arrow { -+ bottom: -11px; -+ left: 50%; -+ margin-left: -11px; -+ border-top-color: #999; -+ border-top-color: rgba(0, 0, 0, 0.25); -+ border-bottom-width: 0; -+} -+ -+.popover.top .arrow:after { -+ bottom: 1px; -+ margin-left: -10px; -+ border-top-color: #ffffff; -+ border-bottom-width: 0; -+} -+ -+.popover.right .arrow { -+ top: 50%; -+ left: -11px; -+ margin-top: -11px; -+ border-right-color: #999; -+ border-right-color: rgba(0, 0, 0, 0.25); -+ border-left-width: 0; -+} -+ -+.popover.right .arrow:after { -+ bottom: -10px; -+ left: 1px; -+ border-right-color: #ffffff; -+ border-left-width: 0; -+} -+ -+.popover.bottom .arrow { -+ top: -11px; -+ left: 50%; -+ margin-left: -11px; -+ border-bottom-color: #999; -+ border-bottom-color: rgba(0, 0, 0, 0.25); -+ border-top-width: 0; -+} -+ -+.popover.bottom .arrow:after { -+ top: 1px; -+ margin-left: -10px; -+ border-bottom-color: #ffffff; -+ border-top-width: 0; -+} -+ -+.popover.left .arrow { -+ top: 50%; -+ right: -11px; -+ margin-top: -11px; -+ border-left-color: #999; -+ border-left-color: rgba(0, 0, 0, 0.25); -+ border-right-width: 0; -+} -+ -+.popover.left .arrow:after { -+ right: 1px; -+ bottom: -10px; -+ border-left-color: #ffffff; -+ border-right-width: 0; -+} -+ -+.thumbnails { -+ margin-left: -20px; -+ list-style: none; -+ *zoom: 1; -+} -+ -+.thumbnails:before, -+.thumbnails:after { -+ display: table; -+ line-height: 0; -+ content: ""; -+} -+ -+.thumbnails:after { -+ clear: both; -+} -+ -+.row-fluid .thumbnails { -+ margin-left: 0; -+} -+ -+.thumbnails > li { -+ float: left; -+ margin-bottom: 20px; -+ margin-left: 20px; -+} -+ -+.thumbnail { -+ display: block; -+ padding: 4px; -+ line-height: 20px; -+ border: 1px solid #ddd; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -+ -webkit-transition: all 0.2s ease-in-out; -+ -moz-transition: all 0.2s ease-in-out; -+ -o-transition: all 0.2s ease-in-out; -+ transition: all 0.2s ease-in-out; -+} -+ -+a.thumbnail:hover, -+a.thumbnail:focus { -+ border-color: #0088cc; -+ -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -+ -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -+ box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -+} -+ -+.thumbnail > img { -+ display: block; -+ max-width: 100%; -+ margin-right: auto; -+ margin-left: auto; -+} -+ -+.thumbnail .caption { -+ padding: 9px; -+ color: #555555; -+} -+ -+.media, -+.media-body { -+ overflow: hidden; -+ *overflow: visible; -+ zoom: 1; -+} -+ -+.media, -+.media .media { -+ margin-top: 15px; -+} -+ -+.media:first-child { -+ margin-top: 0; -+} -+ -+.media-object { -+ display: block; -+} -+ -+.media-heading { -+ margin: 0 0 5px; -+} -+ -+.media > .pull-left { -+ margin-right: 10px; -+} -+ -+.media > .pull-right { -+ margin-left: 10px; -+} -+ -+.media-list { -+ margin-left: 0; -+ list-style: none; -+} -+ -+.label, -+.badge { -+ display: inline-block; -+ padding: 2px 4px; -+ font-size: 11.844px; -+ font-weight: bold; -+ line-height: 14px; -+ color: #ffffff; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ white-space: nowrap; -+ vertical-align: baseline; -+ background-color: #999999; -+} -+ -+.label { -+ -webkit-border-radius: 3px; -+ -moz-border-radius: 3px; -+ border-radius: 3px; -+} -+ -+.badge { -+ padding-right: 9px; -+ padding-left: 9px; -+ -webkit-border-radius: 9px; -+ -moz-border-radius: 9px; -+ border-radius: 9px; -+} -+ -+.label:empty, -+.badge:empty { -+ display: none; -+} -+ -+a.label:hover, -+a.label:focus, -+a.badge:hover, -+a.badge:focus { -+ color: #ffffff; -+ text-decoration: none; -+ cursor: pointer; -+} -+ -+.label-important, -+.badge-important { -+ background-color: #b94a48; -+} -+ -+.label-important[href], -+.badge-important[href] { -+ background-color: #953b39; -+} -+ -+.label-warning, -+.badge-warning { -+ background-color: #f89406; -+} -+ -+.label-warning[href], -+.badge-warning[href] { -+ background-color: #c67605; -+} -+ -+.label-success, -+.badge-success { -+ background-color: #468847; -+} -+ -+.label-success[href], -+.badge-success[href] { -+ background-color: #356635; -+} -+ -+.label-info, -+.badge-info { -+ background-color: #3a87ad; -+} -+ -+.label-info[href], -+.badge-info[href] { -+ background-color: #2d6987; -+} -+ -+.label-inverse, -+.badge-inverse { -+ background-color: #333333; -+} -+ -+.label-inverse[href], -+.badge-inverse[href] { -+ background-color: #1a1a1a; -+} -+ -+.btn .label, -+.btn .badge { -+ position: relative; -+ top: -1px; -+} -+ -+.btn-mini .label, -+.btn-mini .badge { -+ top: 0; -+} -+ -+@-webkit-keyframes progress-bar-stripes { -+ from { -+ background-position: 40px 0; -+ } -+ to { -+ background-position: 0 0; -+ } -+} -+ -+@-moz-keyframes progress-bar-stripes { -+ from { -+ background-position: 40px 0; -+ } -+ to { -+ background-position: 0 0; -+ } -+} -+ -+@-ms-keyframes progress-bar-stripes { -+ from { -+ background-position: 40px 0; -+ } -+ to { -+ background-position: 0 0; -+ } -+} -+ -+@-o-keyframes progress-bar-stripes { -+ from { -+ background-position: 0 0; -+ } -+ to { -+ background-position: 40px 0; -+ } -+} -+ -+@keyframes progress-bar-stripes { -+ from { -+ background-position: 40px 0; -+ } -+ to { -+ background-position: 0 0; -+ } -+} -+ -+.progress { -+ height: 20px; -+ margin-bottom: 20px; -+ overflow: hidden; -+ background-color: #f7f7f7; -+ background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); -+ background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); -+ background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); -+ background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); -+ background-repeat: repeat-x; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -+} -+ -+.progress .bar { -+ float: left; -+ width: 0; -+ height: 100%; -+ font-size: 12px; -+ color: #ffffff; -+ text-align: center; -+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -+ background-color: #0e90d2; -+ background-image: -moz-linear-gradient(top, #149bdf, #0480be); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); -+ background-image: -webkit-linear-gradient(top, #149bdf, #0480be); -+ background-image: -o-linear-gradient(top, #149bdf, #0480be); -+ background-image: linear-gradient(to bottom, #149bdf, #0480be); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -+ -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+ -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+ box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+ -webkit-box-sizing: border-box; -+ -moz-box-sizing: border-box; -+ box-sizing: border-box; -+ -webkit-transition: width 0.6s ease; -+ -moz-transition: width 0.6s ease; -+ -o-transition: width 0.6s ease; -+ transition: width 0.6s ease; -+} -+ -+.progress .bar + .bar { -+ -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+ -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+ box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -+} -+ -+.progress-striped .bar { -+ background-color: #149bdf; -+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); -+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ -webkit-background-size: 40px 40px; -+ -moz-background-size: 40px 40px; -+ -o-background-size: 40px 40px; -+ background-size: 40px 40px; -+} -+ -+.progress.active .bar { -+ -webkit-animation: progress-bar-stripes 2s linear infinite; -+ -moz-animation: progress-bar-stripes 2s linear infinite; -+ -ms-animation: progress-bar-stripes 2s linear infinite; -+ -o-animation: progress-bar-stripes 2s linear infinite; -+ animation: progress-bar-stripes 2s linear infinite; -+} -+ -+.progress-danger .bar, -+.progress .bar-danger { -+ background-color: #dd514c; -+ background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); -+ background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); -+ background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); -+ background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -+} -+ -+.progress-danger.progress-striped .bar, -+.progress-striped .bar-danger { -+ background-color: #ee5f5b; -+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); -+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+} -+ -+.progress-success .bar, -+.progress .bar-success { -+ background-color: #5eb95e; -+ background-image: -moz-linear-gradient(top, #62c462, #57a957); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); -+ background-image: -webkit-linear-gradient(top, #62c462, #57a957); -+ background-image: -o-linear-gradient(top, #62c462, #57a957); -+ background-image: linear-gradient(to bottom, #62c462, #57a957); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -+} -+ -+.progress-success.progress-striped .bar, -+.progress-striped .bar-success { -+ background-color: #62c462; -+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); -+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+} -+ -+.progress-info .bar, -+.progress .bar-info { -+ background-color: #4bb1cf; -+ background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); -+ background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); -+ background-image: -o-linear-gradient(top, #5bc0de, #339bb9); -+ background-image: linear-gradient(to bottom, #5bc0de, #339bb9); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -+} -+ -+.progress-info.progress-striped .bar, -+.progress-striped .bar-info { -+ background-color: #5bc0de; -+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); -+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+} -+ -+.progress-warning .bar, -+.progress .bar-warning { -+ background-color: #faa732; -+ background-image: -moz-linear-gradient(top, #fbb450, #f89406); -+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); -+ background-image: -webkit-linear-gradient(top, #fbb450, #f89406); -+ background-image: -o-linear-gradient(top, #fbb450, #f89406); -+ background-image: linear-gradient(to bottom, #fbb450, #f89406); -+ background-repeat: repeat-x; -+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -+} -+ -+.progress-warning.progress-striped .bar, -+.progress-striped .bar-warning { -+ background-color: #fbb450; -+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); -+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -+} -+ -+.accordion { -+ margin-bottom: 20px; -+} -+ -+.accordion-group { -+ margin-bottom: 2px; -+ border: 1px solid #e5e5e5; -+ -webkit-border-radius: 4px; -+ -moz-border-radius: 4px; -+ border-radius: 4px; -+} -+ -+.accordion-heading { -+ border-bottom: 0; -+} -+ -+.accordion-heading .accordion-toggle { -+ display: block; -+ padding: 8px 15px; -+} -+ -+.accordion-toggle { -+ cursor: pointer; -+} -+ -+.accordion-inner { -+ padding: 9px 15px; -+ border-top: 1px solid #e5e5e5; -+} -+ -+.carousel { -+ position: relative; -+ margin-bottom: 20px; -+ line-height: 1; -+} -+ -+.carousel-inner { -+ position: relative; -+ width: 100%; -+ overflow: hidden; -+} -+ -+.carousel-inner > .item { -+ position: relative; -+ display: none; -+ -webkit-transition: 0.6s ease-in-out left; -+ -moz-transition: 0.6s ease-in-out left; -+ -o-transition: 0.6s ease-in-out left; -+ transition: 0.6s ease-in-out left; -+} -+ -+.carousel-inner > .item > img, -+.carousel-inner > .item > a > img { -+ display: block; -+ line-height: 1; -+} -+ -+.carousel-inner > .active, -+.carousel-inner > .next, -+.carousel-inner > .prev { -+ display: block; -+} -+ -+.carousel-inner > .active { -+ left: 0; -+} -+ -+.carousel-inner > .next, -+.carousel-inner > .prev { -+ position: absolute; -+ top: 0; -+ width: 100%; -+} -+ -+.carousel-inner > .next { -+ left: 100%; -+} -+ -+.carousel-inner > .prev { -+ left: -100%; -+} -+ -+.carousel-inner > .next.left, -+.carousel-inner > .prev.right { -+ left: 0; -+} -+ -+.carousel-inner > .active.left { -+ left: -100%; -+} -+ -+.carousel-inner > .active.right { -+ left: 100%; -+} -+ -+.carousel-control { -+ position: absolute; -+ top: 40%; -+ left: 15px; -+ width: 40px; -+ height: 40px; -+ margin-top: -20px; -+ font-size: 60px; -+ font-weight: 100; -+ line-height: 30px; -+ color: #ffffff; -+ text-align: center; -+ background: #222222; -+ border: 3px solid #ffffff; -+ -webkit-border-radius: 23px; -+ -moz-border-radius: 23px; -+ border-radius: 23px; -+ opacity: 0.5; -+ filter: alpha(opacity=50); -+} -+ -+.carousel-control.right { -+ right: 15px; -+ left: auto; -+} -+ -+.carousel-control:hover, -+.carousel-control:focus { -+ color: #ffffff; -+ text-decoration: none; -+ opacity: 0.9; -+ filter: alpha(opacity=90); -+} -+ -+.carousel-indicators { -+ position: absolute; -+ top: 15px; -+ right: 15px; -+ z-index: 5; -+ margin: 0; -+ list-style: none; -+} -+ -+.carousel-indicators li { -+ display: block; -+ float: left; -+ width: 10px; -+ height: 10px; -+ margin-left: 5px; -+ text-indent: -999px; -+ background-color: #ccc; -+ background-color: rgba(255, 255, 255, 0.25); -+ border-radius: 5px; -+} -+ -+.carousel-indicators .active { -+ background-color: #fff; -+} -+ -+.carousel-caption { -+ position: absolute; -+ right: 0; -+ bottom: 0; -+ left: 0; -+ padding: 15px; -+ background: #333333; -+ background: rgba(0, 0, 0, 0.75); -+} -+ -+.carousel-caption h4, -+.carousel-caption p { -+ line-height: 20px; -+ color: #ffffff; -+} -+ -+.carousel-caption h4 { -+ margin: 0 0 5px; -+} -+ -+.carousel-caption p { -+ margin-bottom: 0; -+} -+ -+.hero-unit { -+ padding: 60px; -+ margin-bottom: 30px; -+ font-size: 18px; -+ font-weight: 200; -+ line-height: 30px; -+ color: inherit; -+ background-color: #eeeeee; -+ -webkit-border-radius: 6px; -+ -moz-border-radius: 6px; -+ border-radius: 6px; -+} -+ -+.hero-unit h1 { -+ margin-bottom: 0; -+ font-size: 60px; -+ line-height: 1; -+ letter-spacing: -1px; -+ color: inherit; -+} -+ -+.hero-unit li { -+ line-height: 30px; -+} -+ -+.pull-right { -+ float: right; -+} -+ -+.pull-left { -+ float: left; -+} -+ -+.hide { -+ display: none; -+} -+ -+.show { -+ display: block; -+} -+ -+.invisible { -+ visibility: hidden; -+} -+ -+.affix { -+ position: fixed; -+} -Index: django-guardian-1.1.1/example_project/static/js/bootstrap.js -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ django-guardian-1.1.1/example_project/static/js/bootstrap.js 2013-09-30 17:15:02.881702782 +0900 -@@ -0,0 +1,2268 @@ -+/* =================================================== -+ * bootstrap-transition.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#transitions -+ * =================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) -+ * ======================================================= */ -+ -+ $(function () { -+ -+ $.support.transition = (function () { -+ -+ var transitionEnd = (function () { -+ -+ var el = document.createElement('bootstrap') -+ , transEndEventNames = { -+ 'WebkitTransition' : 'webkitTransitionEnd' -+ , 'MozTransition' : 'transitionend' -+ , 'OTransition' : 'oTransitionEnd otransitionend' -+ , 'transition' : 'transitionend' -+ } -+ , name -+ -+ for (name in transEndEventNames){ -+ if (el.style[name] !== undefined) { -+ return transEndEventNames[name] -+ } -+ } -+ -+ }()) -+ -+ return transitionEnd && { -+ end: transitionEnd -+ } -+ -+ })() -+ -+ }) -+ -+}(window.jQuery);/* ========================================================== -+ * bootstrap-alert.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#alerts -+ * ========================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* ALERT CLASS DEFINITION -+ * ====================== */ -+ -+ var dismiss = '[data-dismiss="alert"]' -+ , Alert = function (el) { -+ $(el).on('click', dismiss, this.close) -+ } -+ -+ Alert.prototype.close = function (e) { -+ var $this = $(this) -+ , selector = $this.attr('data-target') -+ , $parent -+ -+ if (!selector) { -+ selector = $this.attr('href') -+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 -+ } -+ -+ $parent = $(selector) -+ -+ e && e.preventDefault() -+ -+ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) -+ -+ $parent.trigger(e = $.Event('close')) -+ -+ if (e.isDefaultPrevented()) return -+ -+ $parent.removeClass('in') -+ -+ function removeElement() { -+ $parent -+ .trigger('closed') -+ .remove() -+ } -+ -+ $.support.transition && $parent.hasClass('fade') ? -+ $parent.on($.support.transition.end, removeElement) : -+ removeElement() -+ } -+ -+ -+ /* ALERT PLUGIN DEFINITION -+ * ======================= */ -+ -+ var old = $.fn.alert -+ -+ $.fn.alert = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('alert') -+ if (!data) $this.data('alert', (data = new Alert(this))) -+ if (typeof option == 'string') data[option].call($this) -+ }) -+ } -+ -+ $.fn.alert.Constructor = Alert -+ -+ -+ /* ALERT NO CONFLICT -+ * ================= */ -+ -+ $.fn.alert.noConflict = function () { -+ $.fn.alert = old -+ return this -+ } -+ -+ -+ /* ALERT DATA-API -+ * ============== */ -+ -+ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) -+ -+}(window.jQuery);/* ============================================================ -+ * bootstrap-button.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#buttons -+ * ============================================================ -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* BUTTON PUBLIC CLASS DEFINITION -+ * ============================== */ -+ -+ var Button = function (element, options) { -+ this.$element = $(element) -+ this.options = $.extend({}, $.fn.button.defaults, options) -+ } -+ -+ Button.prototype.setState = function (state) { -+ var d = 'disabled' -+ , $el = this.$element -+ , data = $el.data() -+ , val = $el.is('input') ? 'val' : 'html' -+ -+ state = state + 'Text' -+ data.resetText || $el.data('resetText', $el[val]()) -+ -+ $el[val](data[state] || this.options[state]) -+ -+ // push to event loop to allow forms to submit -+ setTimeout(function () { -+ state == 'loadingText' ? -+ $el.addClass(d).attr(d, d) : -+ $el.removeClass(d).removeAttr(d) -+ }, 0) -+ } -+ -+ Button.prototype.toggle = function () { -+ var $parent = this.$element.closest('[data-toggle="buttons-radio"]') -+ -+ $parent && $parent -+ .find('.active') -+ .removeClass('active') -+ -+ this.$element.toggleClass('active') -+ } -+ -+ -+ /* BUTTON PLUGIN DEFINITION -+ * ======================== */ -+ -+ var old = $.fn.button -+ -+ $.fn.button = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('button') -+ , options = typeof option == 'object' && option -+ if (!data) $this.data('button', (data = new Button(this, options))) -+ if (option == 'toggle') data.toggle() -+ else if (option) data.setState(option) -+ }) -+ } -+ -+ $.fn.button.defaults = { -+ loadingText: 'loading...' -+ } -+ -+ $.fn.button.Constructor = Button -+ -+ -+ /* BUTTON NO CONFLICT -+ * ================== */ -+ -+ $.fn.button.noConflict = function () { -+ $.fn.button = old -+ return this -+ } -+ -+ -+ /* BUTTON DATA-API -+ * =============== */ -+ -+ $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { -+ var $btn = $(e.target) -+ if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') -+ $btn.button('toggle') -+ }) -+ -+}(window.jQuery);/* ========================================================== -+ * bootstrap-carousel.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#carousel -+ * ========================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* CAROUSEL CLASS DEFINITION -+ * ========================= */ -+ -+ var Carousel = function (element, options) { -+ this.$element = $(element) -+ this.$indicators = this.$element.find('.carousel-indicators') -+ this.options = options -+ this.options.pause == 'hover' && this.$element -+ .on('mouseenter', $.proxy(this.pause, this)) -+ .on('mouseleave', $.proxy(this.cycle, this)) -+ } -+ -+ Carousel.prototype = { -+ -+ cycle: function (e) { -+ if (!e) this.paused = false -+ if (this.interval) clearInterval(this.interval); -+ this.options.interval -+ && !this.paused -+ && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) -+ return this -+ } -+ -+ , getActiveIndex: function () { -+ this.$active = this.$element.find('.item.active') -+ this.$items = this.$active.parent().children() -+ return this.$items.index(this.$active) -+ } -+ -+ , to: function (pos) { -+ var activeIndex = this.getActiveIndex() -+ , that = this -+ -+ if (pos > (this.$items.length - 1) || pos < 0) return -+ -+ if (this.sliding) { -+ return this.$element.one('slid', function () { -+ that.to(pos) -+ }) -+ } -+ -+ if (activeIndex == pos) { -+ return this.pause().cycle() -+ } -+ -+ return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) -+ } -+ -+ , pause: function (e) { -+ if (!e) this.paused = true -+ if (this.$element.find('.next, .prev').length && $.support.transition.end) { -+ this.$element.trigger($.support.transition.end) -+ this.cycle() -+ } -+ clearInterval(this.interval) -+ this.interval = null -+ return this -+ } -+ -+ , next: function () { -+ if (this.sliding) return -+ return this.slide('next') -+ } -+ -+ , prev: function () { -+ if (this.sliding) return -+ return this.slide('prev') -+ } -+ -+ , slide: function (type, next) { -+ var $active = this.$element.find('.item.active') -+ , $next = next || $active[type]() -+ , isCycling = this.interval -+ , direction = type == 'next' ? 'left' : 'right' -+ , fallback = type == 'next' ? 'first' : 'last' -+ , that = this -+ , e -+ -+ this.sliding = true -+ -+ isCycling && this.pause() -+ -+ $next = $next.length ? $next : this.$element.find('.item')[fallback]() -+ -+ e = $.Event('slide', { -+ relatedTarget: $next[0] -+ , direction: direction -+ }) -+ -+ if ($next.hasClass('active')) return -+ -+ if (this.$indicators.length) { -+ this.$indicators.find('.active').removeClass('active') -+ this.$element.one('slid', function () { -+ var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) -+ $nextIndicator && $nextIndicator.addClass('active') -+ }) -+ } -+ -+ if ($.support.transition && this.$element.hasClass('slide')) { -+ this.$element.trigger(e) -+ if (e.isDefaultPrevented()) return -+ $next.addClass(type) -+ $next[0].offsetWidth // force reflow -+ $active.addClass(direction) -+ $next.addClass(direction) -+ this.$element.one($.support.transition.end, function () { -+ $next.removeClass([type, direction].join(' ')).addClass('active') -+ $active.removeClass(['active', direction].join(' ')) -+ that.sliding = false -+ setTimeout(function () { that.$element.trigger('slid') }, 0) -+ }) -+ } else { -+ this.$element.trigger(e) -+ if (e.isDefaultPrevented()) return -+ $active.removeClass('active') -+ $next.addClass('active') -+ this.sliding = false -+ this.$element.trigger('slid') -+ } -+ -+ isCycling && this.cycle() -+ -+ return this -+ } -+ -+ } -+ -+ -+ /* CAROUSEL PLUGIN DEFINITION -+ * ========================== */ -+ -+ var old = $.fn.carousel -+ -+ $.fn.carousel = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('carousel') -+ , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) -+ , action = typeof option == 'string' ? option : options.slide -+ if (!data) $this.data('carousel', (data = new Carousel(this, options))) -+ if (typeof option == 'number') data.to(option) -+ else if (action) data[action]() -+ else if (options.interval) data.pause().cycle() -+ }) -+ } -+ -+ $.fn.carousel.defaults = { -+ interval: 5000 -+ , pause: 'hover' -+ } -+ -+ $.fn.carousel.Constructor = Carousel -+ -+ -+ /* CAROUSEL NO CONFLICT -+ * ==================== */ -+ -+ $.fn.carousel.noConflict = function () { -+ $.fn.carousel = old -+ return this -+ } -+ -+ /* CAROUSEL DATA-API -+ * ================= */ -+ -+ $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { -+ var $this = $(this), href -+ , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 -+ , options = $.extend({}, $target.data(), $this.data()) -+ , slideIndex -+ -+ $target.carousel(options) -+ -+ if (slideIndex = $this.attr('data-slide-to')) { -+ $target.data('carousel').pause().to(slideIndex).cycle() -+ } -+ -+ e.preventDefault() -+ }) -+ -+}(window.jQuery);/* ============================================================= -+ * bootstrap-collapse.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#collapse -+ * ============================================================= -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* COLLAPSE PUBLIC CLASS DEFINITION -+ * ================================ */ -+ -+ var Collapse = function (element, options) { -+ this.$element = $(element) -+ this.options = $.extend({}, $.fn.collapse.defaults, options) -+ -+ if (this.options.parent) { -+ this.$parent = $(this.options.parent) -+ } -+ -+ this.options.toggle && this.toggle() -+ } -+ -+ Collapse.prototype = { -+ -+ constructor: Collapse -+ -+ , dimension: function () { -+ var hasWidth = this.$element.hasClass('width') -+ return hasWidth ? 'width' : 'height' -+ } -+ -+ , show: function () { -+ var dimension -+ , scroll -+ , actives -+ , hasData -+ -+ if (this.transitioning || this.$element.hasClass('in')) return -+ -+ dimension = this.dimension() -+ scroll = $.camelCase(['scroll', dimension].join('-')) -+ actives = this.$parent && this.$parent.find('> .accordion-group > .in') -+ -+ if (actives && actives.length) { -+ hasData = actives.data('collapse') -+ if (hasData && hasData.transitioning) return -+ actives.collapse('hide') -+ hasData || actives.data('collapse', null) -+ } -+ -+ this.$element[dimension](0) -+ this.transition('addClass', $.Event('show'), 'shown') -+ $.support.transition && this.$element[dimension](this.$element[0][scroll]) -+ } -+ -+ , hide: function () { -+ var dimension -+ if (this.transitioning || !this.$element.hasClass('in')) return -+ dimension = this.dimension() -+ this.reset(this.$element[dimension]()) -+ this.transition('removeClass', $.Event('hide'), 'hidden') -+ this.$element[dimension](0) -+ } -+ -+ , reset: function (size) { -+ var dimension = this.dimension() -+ -+ this.$element -+ .removeClass('collapse') -+ [dimension](size || 'auto') -+ [0].offsetWidth -+ -+ this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') -+ -+ return this -+ } -+ -+ , transition: function (method, startEvent, completeEvent) { -+ var that = this -+ , complete = function () { -+ if (startEvent.type == 'show') that.reset() -+ that.transitioning = 0 -+ that.$element.trigger(completeEvent) -+ } -+ -+ this.$element.trigger(startEvent) -+ -+ if (startEvent.isDefaultPrevented()) return -+ -+ this.transitioning = 1 -+ -+ this.$element[method]('in') -+ -+ $.support.transition && this.$element.hasClass('collapse') ? -+ this.$element.one($.support.transition.end, complete) : -+ complete() -+ } -+ -+ , toggle: function () { -+ this[this.$element.hasClass('in') ? 'hide' : 'show']() -+ } -+ -+ } -+ -+ -+ /* COLLAPSE PLUGIN DEFINITION -+ * ========================== */ -+ -+ var old = $.fn.collapse -+ -+ $.fn.collapse = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('collapse') -+ , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) -+ if (!data) $this.data('collapse', (data = new Collapse(this, options))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.collapse.defaults = { -+ toggle: true -+ } -+ -+ $.fn.collapse.Constructor = Collapse -+ -+ -+ /* COLLAPSE NO CONFLICT -+ * ==================== */ -+ -+ $.fn.collapse.noConflict = function () { -+ $.fn.collapse = old -+ return this -+ } -+ -+ -+ /* COLLAPSE DATA-API -+ * ================= */ -+ -+ $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { -+ var $this = $(this), href -+ , target = $this.attr('data-target') -+ || e.preventDefault() -+ || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 -+ , option = $(target).data('collapse') ? 'toggle' : $this.data() -+ $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') -+ $(target).collapse(option) -+ }) -+ -+}(window.jQuery);/* ============================================================ -+ * bootstrap-dropdown.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns -+ * ============================================================ -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* DROPDOWN CLASS DEFINITION -+ * ========================= */ -+ -+ var toggle = '[data-toggle=dropdown]' -+ , Dropdown = function (element) { -+ var $el = $(element).on('click.dropdown.data-api', this.toggle) -+ $('html').on('click.dropdown.data-api', function () { -+ $el.parent().removeClass('open') -+ }) -+ } -+ -+ Dropdown.prototype = { -+ -+ constructor: Dropdown -+ -+ , toggle: function (e) { -+ var $this = $(this) -+ , $parent -+ , isActive -+ -+ if ($this.is('.disabled, :disabled')) return -+ -+ $parent = getParent($this) -+ -+ isActive = $parent.hasClass('open') -+ -+ clearMenus() -+ -+ if (!isActive) { -+ $parent.toggleClass('open') -+ } -+ -+ $this.focus() -+ -+ return false -+ } -+ -+ , keydown: function (e) { -+ var $this -+ , $items -+ , $active -+ , $parent -+ , isActive -+ , index -+ -+ if (!/(38|40|27)/.test(e.keyCode)) return -+ -+ $this = $(this) -+ -+ e.preventDefault() -+ e.stopPropagation() -+ -+ if ($this.is('.disabled, :disabled')) return -+ -+ $parent = getParent($this) -+ -+ isActive = $parent.hasClass('open') -+ -+ if (!isActive || (isActive && e.keyCode == 27)) { -+ if (e.which == 27) $parent.find(toggle).focus() -+ return $this.click() -+ } -+ -+ $items = $('[role=menu] li:not(.divider):visible a', $parent) -+ -+ if (!$items.length) return -+ -+ index = $items.index($items.filter(':focus')) -+ -+ if (e.keyCode == 38 && index > 0) index-- // up -+ if (e.keyCode == 40 && index < $items.length - 1) index++ // down -+ if (!~index) index = 0 -+ -+ $items -+ .eq(index) -+ .focus() -+ } -+ -+ } -+ -+ function clearMenus() { -+ $(toggle).each(function () { -+ getParent($(this)).removeClass('open') -+ }) -+ } -+ -+ function getParent($this) { -+ var selector = $this.attr('data-target') -+ , $parent -+ -+ if (!selector) { -+ selector = $this.attr('href') -+ selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 -+ } -+ -+ $parent = selector && $(selector) -+ -+ if (!$parent || !$parent.length) $parent = $this.parent() -+ -+ return $parent -+ } -+ -+ -+ /* DROPDOWN PLUGIN DEFINITION -+ * ========================== */ -+ -+ var old = $.fn.dropdown -+ -+ $.fn.dropdown = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('dropdown') -+ if (!data) $this.data('dropdown', (data = new Dropdown(this))) -+ if (typeof option == 'string') data[option].call($this) -+ }) -+ } -+ -+ $.fn.dropdown.Constructor = Dropdown -+ -+ -+ /* DROPDOWN NO CONFLICT -+ * ==================== */ -+ -+ $.fn.dropdown.noConflict = function () { -+ $.fn.dropdown = old -+ return this -+ } -+ -+ -+ /* APPLY TO STANDARD DROPDOWN ELEMENTS -+ * =================================== */ -+ -+ $(document) -+ .on('click.dropdown.data-api', clearMenus) -+ .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) -+ .on('.dropdown-menu', function (e) { e.stopPropagation() }) -+ .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) -+ .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -+ -+}(window.jQuery); -+/* ========================================================= -+ * bootstrap-modal.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#modals -+ * ========================================================= -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* MODAL CLASS DEFINITION -+ * ====================== */ -+ -+ var Modal = function (element, options) { -+ this.options = options -+ this.$element = $(element) -+ .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) -+ this.options.remote && this.$element.find('.modal-body').load(this.options.remote) -+ } -+ -+ Modal.prototype = { -+ -+ constructor: Modal -+ -+ , toggle: function () { -+ return this[!this.isShown ? 'show' : 'hide']() -+ } -+ -+ , show: function () { -+ var that = this -+ , e = $.Event('show') -+ -+ this.$element.trigger(e) -+ -+ if (this.isShown || e.isDefaultPrevented()) return -+ -+ this.isShown = true -+ -+ this.escape() -+ -+ this.backdrop(function () { -+ var transition = $.support.transition && that.$element.hasClass('fade') -+ -+ if (!that.$element.parent().length) { -+ that.$element.appendTo(document.body) //don't move modals dom position -+ } -+ -+ that.$element.show() -+ -+ if (transition) { -+ that.$element[0].offsetWidth // force reflow -+ } -+ -+ that.$element -+ .addClass('in') -+ .attr('aria-hidden', false) -+ -+ that.enforceFocus() -+ -+ transition ? -+ that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : -+ that.$element.focus().trigger('shown') -+ -+ }) -+ } -+ -+ , hide: function (e) { -+ e && e.preventDefault() -+ -+ var that = this -+ -+ e = $.Event('hide') -+ -+ this.$element.trigger(e) -+ -+ if (!this.isShown || e.isDefaultPrevented()) return -+ -+ this.isShown = false -+ -+ this.escape() -+ -+ $(document).off('focusin.modal') -+ -+ this.$element -+ .removeClass('in') -+ .attr('aria-hidden', true) -+ -+ $.support.transition && this.$element.hasClass('fade') ? -+ this.hideWithTransition() : -+ this.hideModal() -+ } -+ -+ , enforceFocus: function () { -+ var that = this -+ $(document).on('focusin.modal', function (e) { -+ if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { -+ that.$element.focus() -+ } -+ }) -+ } -+ -+ , escape: function () { -+ var that = this -+ if (this.isShown && this.options.keyboard) { -+ this.$element.on('keyup.dismiss.modal', function ( e ) { -+ e.which == 27 && that.hide() -+ }) -+ } else if (!this.isShown) { -+ this.$element.off('keyup.dismiss.modal') -+ } -+ } -+ -+ , hideWithTransition: function () { -+ var that = this -+ , timeout = setTimeout(function () { -+ that.$element.off($.support.transition.end) -+ that.hideModal() -+ }, 500) -+ -+ this.$element.one($.support.transition.end, function () { -+ clearTimeout(timeout) -+ that.hideModal() -+ }) -+ } -+ -+ , hideModal: function () { -+ var that = this -+ this.$element.hide() -+ this.backdrop(function () { -+ that.removeBackdrop() -+ that.$element.trigger('hidden') -+ }) -+ } -+ -+ , removeBackdrop: function () { -+ this.$backdrop.remove() -+ this.$backdrop = null -+ } -+ -+ , backdrop: function (callback) { -+ var that = this -+ , animate = this.$element.hasClass('fade') ? 'fade' : '' -+ -+ if (this.isShown && this.options.backdrop) { -+ var doAnimate = $.support.transition && animate -+ -+ this.$backdrop = $('
') -+ .appendTo(document.body) -+ -+ this.$backdrop.click( -+ this.options.backdrop == 'static' ? -+ $.proxy(this.$element[0].focus, this.$element[0]) -+ : $.proxy(this.hide, this) -+ ) -+ -+ if (doAnimate) this.$backdrop[0].offsetWidth // force reflow -+ -+ this.$backdrop.addClass('in') -+ -+ if (!callback) return -+ -+ doAnimate ? -+ this.$backdrop.one($.support.transition.end, callback) : -+ callback() -+ -+ } else if (!this.isShown && this.$backdrop) { -+ this.$backdrop.removeClass('in') -+ -+ $.support.transition && this.$element.hasClass('fade')? -+ this.$backdrop.one($.support.transition.end, callback) : -+ callback() -+ -+ } else if (callback) { -+ callback() -+ } -+ } -+ } -+ -+ -+ /* MODAL PLUGIN DEFINITION -+ * ======================= */ -+ -+ var old = $.fn.modal -+ -+ $.fn.modal = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('modal') -+ , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) -+ if (!data) $this.data('modal', (data = new Modal(this, options))) -+ if (typeof option == 'string') data[option]() -+ else if (options.show) data.show() -+ }) -+ } -+ -+ $.fn.modal.defaults = { -+ backdrop: true -+ , keyboard: true -+ , show: true -+ } -+ -+ $.fn.modal.Constructor = Modal -+ -+ -+ /* MODAL NO CONFLICT -+ * ================= */ -+ -+ $.fn.modal.noConflict = function () { -+ $.fn.modal = old -+ return this -+ } -+ -+ -+ /* MODAL DATA-API -+ * ============== */ -+ -+ $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { -+ var $this = $(this) -+ , href = $this.attr('href') -+ , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 -+ , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) -+ -+ e.preventDefault() -+ -+ $target -+ .modal(option) -+ .one('hide', function () { -+ $this.focus() -+ }) -+ }) -+ -+}(window.jQuery); -+/* =========================================================== -+ * bootstrap-tooltip.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#tooltips -+ * Inspired by the original jQuery.tipsy by Jason Frame -+ * =========================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* TOOLTIP PUBLIC CLASS DEFINITION -+ * =============================== */ -+ -+ var Tooltip = function (element, options) { -+ this.init('tooltip', element, options) -+ } -+ -+ Tooltip.prototype = { -+ -+ constructor: Tooltip -+ -+ , init: function (type, element, options) { -+ var eventIn -+ , eventOut -+ , triggers -+ , trigger -+ , i -+ -+ this.type = type -+ this.$element = $(element) -+ this.options = this.getOptions(options) -+ this.enabled = true -+ -+ triggers = this.options.trigger.split(' ') -+ -+ for (i = triggers.length; i--;) { -+ trigger = triggers[i] -+ if (trigger == 'click') { -+ this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) -+ } else if (trigger != 'manual') { -+ eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' -+ eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' -+ this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) -+ this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) -+ } -+ } -+ -+ this.options.selector ? -+ (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : -+ this.fixTitle() -+ } -+ -+ , getOptions: function (options) { -+ options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) -+ -+ if (options.delay && typeof options.delay == 'number') { -+ options.delay = { -+ show: options.delay -+ , hide: options.delay -+ } -+ } -+ -+ return options -+ } -+ -+ , enter: function (e) { -+ var self = $(e.currentTarget)[this.type](this._options).data(this.type) -+ -+ if (!self.options.delay || !self.options.delay.show) return self.show() -+ -+ clearTimeout(this.timeout) -+ self.hoverState = 'in' -+ this.timeout = setTimeout(function() { -+ if (self.hoverState == 'in') self.show() -+ }, self.options.delay.show) -+ } -+ -+ , leave: function (e) { -+ var self = $(e.currentTarget)[this.type](this._options).data(this.type) -+ -+ if (this.timeout) clearTimeout(this.timeout) -+ if (!self.options.delay || !self.options.delay.hide) return self.hide() -+ -+ self.hoverState = 'out' -+ this.timeout = setTimeout(function() { -+ if (self.hoverState == 'out') self.hide() -+ }, self.options.delay.hide) -+ } -+ -+ , show: function () { -+ var $tip -+ , pos -+ , actualWidth -+ , actualHeight -+ , placement -+ , tp -+ , e = $.Event('show') -+ -+ if (this.hasContent() && this.enabled) { -+ this.$element.trigger(e) -+ if (e.isDefaultPrevented()) return -+ $tip = this.tip() -+ this.setContent() -+ -+ if (this.options.animation) { -+ $tip.addClass('fade') -+ } -+ -+ placement = typeof this.options.placement == 'function' ? -+ this.options.placement.call(this, $tip[0], this.$element[0]) : -+ this.options.placement -+ -+ $tip -+ .detach() -+ .css({ top: 0, left: 0, display: 'block' }) -+ -+ this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) -+ -+ pos = this.getPosition() -+ -+ actualWidth = $tip[0].offsetWidth -+ actualHeight = $tip[0].offsetHeight -+ -+ switch (placement) { -+ case 'bottom': -+ tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} -+ break -+ case 'top': -+ tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} -+ break -+ case 'left': -+ tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} -+ break -+ case 'right': -+ tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} -+ break -+ } -+ -+ this.applyPlacement(tp, placement) -+ this.$element.trigger('shown') -+ } -+ } -+ -+ , applyPlacement: function(offset, placement){ -+ var $tip = this.tip() -+ , width = $tip[0].offsetWidth -+ , height = $tip[0].offsetHeight -+ , actualWidth -+ , actualHeight -+ , delta -+ , replace -+ -+ $tip -+ .offset(offset) -+ .addClass(placement) -+ .addClass('in') -+ -+ actualWidth = $tip[0].offsetWidth -+ actualHeight = $tip[0].offsetHeight -+ -+ if (placement == 'top' && actualHeight != height) { -+ offset.top = offset.top + height - actualHeight -+ replace = true -+ } -+ -+ if (placement == 'bottom' || placement == 'top') { -+ delta = 0 -+ -+ if (offset.left < 0){ -+ delta = offset.left * -2 -+ offset.left = 0 -+ $tip.offset(offset) -+ actualWidth = $tip[0].offsetWidth -+ actualHeight = $tip[0].offsetHeight -+ } -+ -+ this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') -+ } else { -+ this.replaceArrow(actualHeight - height, actualHeight, 'top') -+ } -+ -+ if (replace) $tip.offset(offset) -+ } -+ -+ , replaceArrow: function(delta, dimension, position){ -+ this -+ .arrow() -+ .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') -+ } -+ -+ , setContent: function () { -+ var $tip = this.tip() -+ , title = this.getTitle() -+ -+ $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) -+ $tip.removeClass('fade in top bottom left right') -+ } -+ -+ , hide: function () { -+ var that = this -+ , $tip = this.tip() -+ , e = $.Event('hide') -+ -+ this.$element.trigger(e) -+ if (e.isDefaultPrevented()) return -+ -+ $tip.removeClass('in') -+ -+ function removeWithAnimation() { -+ var timeout = setTimeout(function () { -+ $tip.off($.support.transition.end).detach() -+ }, 500) -+ -+ $tip.one($.support.transition.end, function () { -+ clearTimeout(timeout) -+ $tip.detach() -+ }) -+ } -+ -+ $.support.transition && this.$tip.hasClass('fade') ? -+ removeWithAnimation() : -+ $tip.detach() -+ -+ this.$element.trigger('hidden') -+ -+ return this -+ } -+ -+ , fixTitle: function () { -+ var $e = this.$element -+ if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { -+ $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') -+ } -+ } -+ -+ , hasContent: function () { -+ return this.getTitle() -+ } -+ -+ , getPosition: function () { -+ var el = this.$element[0] -+ return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { -+ width: el.offsetWidth -+ , height: el.offsetHeight -+ }, this.$element.offset()) -+ } -+ -+ , getTitle: function () { -+ var title -+ , $e = this.$element -+ , o = this.options -+ -+ title = $e.attr('data-original-title') -+ || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) -+ -+ return title -+ } -+ -+ , tip: function () { -+ return this.$tip = this.$tip || $(this.options.template) -+ } -+ -+ , arrow: function(){ -+ return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") -+ } -+ -+ , validate: function () { -+ if (!this.$element[0].parentNode) { -+ this.hide() -+ this.$element = null -+ this.options = null -+ } -+ } -+ -+ , enable: function () { -+ this.enabled = true -+ } -+ -+ , disable: function () { -+ this.enabled = false -+ } -+ -+ , toggleEnabled: function () { -+ this.enabled = !this.enabled -+ } -+ -+ , toggle: function (e) { -+ var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this -+ self.tip().hasClass('in') ? self.hide() : self.show() -+ } -+ -+ , destroy: function () { -+ this.hide().$element.off('.' + this.type).removeData(this.type) -+ } -+ -+ } -+ -+ -+ /* TOOLTIP PLUGIN DEFINITION -+ * ========================= */ -+ -+ var old = $.fn.tooltip -+ -+ $.fn.tooltip = function ( option ) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('tooltip') -+ , options = typeof option == 'object' && option -+ if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.tooltip.Constructor = Tooltip -+ -+ $.fn.tooltip.defaults = { -+ animation: true -+ , placement: 'top' -+ , selector: false -+ , template: '
' -+ , trigger: 'hover focus' -+ , title: '' -+ , delay: 0 -+ , html: false -+ , container: false -+ } -+ -+ -+ /* TOOLTIP NO CONFLICT -+ * =================== */ -+ -+ $.fn.tooltip.noConflict = function () { -+ $.fn.tooltip = old -+ return this -+ } -+ -+}(window.jQuery); -+/* =========================================================== -+ * bootstrap-popover.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#popovers -+ * =========================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* POPOVER PUBLIC CLASS DEFINITION -+ * =============================== */ -+ -+ var Popover = function (element, options) { -+ this.init('popover', element, options) -+ } -+ -+ -+ /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js -+ ========================================== */ -+ -+ Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { -+ -+ constructor: Popover -+ -+ , setContent: function () { -+ var $tip = this.tip() -+ , title = this.getTitle() -+ , content = this.getContent() -+ -+ $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) -+ $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) -+ -+ $tip.removeClass('fade top bottom left right in') -+ } -+ -+ , hasContent: function () { -+ return this.getTitle() || this.getContent() -+ } -+ -+ , getContent: function () { -+ var content -+ , $e = this.$element -+ , o = this.options -+ -+ content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) -+ || $e.attr('data-content') -+ -+ return content -+ } -+ -+ , tip: function () { -+ if (!this.$tip) { -+ this.$tip = $(this.options.template) -+ } -+ return this.$tip -+ } -+ -+ , destroy: function () { -+ this.hide().$element.off('.' + this.type).removeData(this.type) -+ } -+ -+ }) -+ -+ -+ /* POPOVER PLUGIN DEFINITION -+ * ======================= */ -+ -+ var old = $.fn.popover -+ -+ $.fn.popover = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('popover') -+ , options = typeof option == 'object' && option -+ if (!data) $this.data('popover', (data = new Popover(this, options))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.popover.Constructor = Popover -+ -+ $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { -+ placement: 'right' -+ , trigger: 'click' -+ , content: '' -+ , template: '

' -+ }) -+ -+ -+ /* POPOVER NO CONFLICT -+ * =================== */ -+ -+ $.fn.popover.noConflict = function () { -+ $.fn.popover = old -+ return this -+ } -+ -+}(window.jQuery); -+/* ============================================================= -+ * bootstrap-scrollspy.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy -+ * ============================================================= -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* SCROLLSPY CLASS DEFINITION -+ * ========================== */ -+ -+ function ScrollSpy(element, options) { -+ var process = $.proxy(this.process, this) -+ , $element = $(element).is('body') ? $(window) : $(element) -+ , href -+ this.options = $.extend({}, $.fn.scrollspy.defaults, options) -+ this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) -+ this.selector = (this.options.target -+ || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 -+ || '') + ' .nav li > a' -+ this.$body = $('body') -+ this.refresh() -+ this.process() -+ } -+ -+ ScrollSpy.prototype = { -+ -+ constructor: ScrollSpy -+ -+ , refresh: function () { -+ var self = this -+ , $targets -+ -+ this.offsets = $([]) -+ this.targets = $([]) -+ -+ $targets = this.$body -+ .find(this.selector) -+ .map(function () { -+ var $el = $(this) -+ , href = $el.data('target') || $el.attr('href') -+ , $href = /^#\w/.test(href) && $(href) -+ return ( $href -+ && $href.length -+ && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null -+ }) -+ .sort(function (a, b) { return a[0] - b[0] }) -+ .each(function () { -+ self.offsets.push(this[0]) -+ self.targets.push(this[1]) -+ }) -+ } -+ -+ , process: function () { -+ var scrollTop = this.$scrollElement.scrollTop() + this.options.offset -+ , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight -+ , maxScroll = scrollHeight - this.$scrollElement.height() -+ , offsets = this.offsets -+ , targets = this.targets -+ , activeTarget = this.activeTarget -+ , i -+ -+ if (scrollTop >= maxScroll) { -+ return activeTarget != (i = targets.last()[0]) -+ && this.activate ( i ) -+ } -+ -+ for (i = offsets.length; i--;) { -+ activeTarget != targets[i] -+ && scrollTop >= offsets[i] -+ && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) -+ && this.activate( targets[i] ) -+ } -+ } -+ -+ , activate: function (target) { -+ var active -+ , selector -+ -+ this.activeTarget = target -+ -+ $(this.selector) -+ .parent('.active') -+ .removeClass('active') -+ -+ selector = this.selector -+ + '[data-target="' + target + '"],' -+ + this.selector + '[href="' + target + '"]' -+ -+ active = $(selector) -+ .parent('li') -+ .addClass('active') -+ -+ if (active.parent('.dropdown-menu').length) { -+ active = active.closest('li.dropdown').addClass('active') -+ } -+ -+ active.trigger('activate') -+ } -+ -+ } -+ -+ -+ /* SCROLLSPY PLUGIN DEFINITION -+ * =========================== */ -+ -+ var old = $.fn.scrollspy -+ -+ $.fn.scrollspy = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('scrollspy') -+ , options = typeof option == 'object' && option -+ if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.scrollspy.Constructor = ScrollSpy -+ -+ $.fn.scrollspy.defaults = { -+ offset: 10 -+ } -+ -+ -+ /* SCROLLSPY NO CONFLICT -+ * ===================== */ -+ -+ $.fn.scrollspy.noConflict = function () { -+ $.fn.scrollspy = old -+ return this -+ } -+ -+ -+ /* SCROLLSPY DATA-API -+ * ================== */ -+ -+ $(window).on('load', function () { -+ $('[data-spy="scroll"]').each(function () { -+ var $spy = $(this) -+ $spy.scrollspy($spy.data()) -+ }) -+ }) -+ -+}(window.jQuery);/* ======================================================== -+ * bootstrap-tab.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#tabs -+ * ======================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* TAB CLASS DEFINITION -+ * ==================== */ -+ -+ var Tab = function (element) { -+ this.element = $(element) -+ } -+ -+ Tab.prototype = { -+ -+ constructor: Tab -+ -+ , show: function () { -+ var $this = this.element -+ , $ul = $this.closest('ul:not(.dropdown-menu)') -+ , selector = $this.attr('data-target') -+ , previous -+ , $target -+ , e -+ -+ if (!selector) { -+ selector = $this.attr('href') -+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 -+ } -+ -+ if ( $this.parent('li').hasClass('active') ) return -+ -+ previous = $ul.find('.active:last a')[0] -+ -+ e = $.Event('show', { -+ relatedTarget: previous -+ }) -+ -+ $this.trigger(e) -+ -+ if (e.isDefaultPrevented()) return -+ -+ $target = $(selector) -+ -+ this.activate($this.parent('li'), $ul) -+ this.activate($target, $target.parent(), function () { -+ $this.trigger({ -+ type: 'shown' -+ , relatedTarget: previous -+ }) -+ }) -+ } -+ -+ , activate: function ( element, container, callback) { -+ var $active = container.find('> .active') -+ , transition = callback -+ && $.support.transition -+ && $active.hasClass('fade') -+ -+ function next() { -+ $active -+ .removeClass('active') -+ .find('> .dropdown-menu > .active') -+ .removeClass('active') -+ -+ element.addClass('active') -+ -+ if (transition) { -+ element[0].offsetWidth // reflow for transition -+ element.addClass('in') -+ } else { -+ element.removeClass('fade') -+ } -+ -+ if ( element.parent('.dropdown-menu') ) { -+ element.closest('li.dropdown').addClass('active') -+ } -+ -+ callback && callback() -+ } -+ -+ transition ? -+ $active.one($.support.transition.end, next) : -+ next() -+ -+ $active.removeClass('in') -+ } -+ } -+ -+ -+ /* TAB PLUGIN DEFINITION -+ * ===================== */ -+ -+ var old = $.fn.tab -+ -+ $.fn.tab = function ( option ) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('tab') -+ if (!data) $this.data('tab', (data = new Tab(this))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.tab.Constructor = Tab -+ -+ -+ /* TAB NO CONFLICT -+ * =============== */ -+ -+ $.fn.tab.noConflict = function () { -+ $.fn.tab = old -+ return this -+ } -+ -+ -+ /* TAB DATA-API -+ * ============ */ -+ -+ $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { -+ e.preventDefault() -+ $(this).tab('show') -+ }) -+ -+}(window.jQuery);/* ============================================================= -+ * bootstrap-typeahead.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#typeahead -+ * ============================================================= -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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($){ -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* 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.highlighter = this.options.highlighter || this.highlighter -+ this.updater = this.options.updater || this.updater -+ this.source = this.options.source -+ this.$menu = $(this.options.menu) -+ this.shown = false -+ this.listen() -+ } -+ -+ Typeahead.prototype = { -+ -+ constructor: Typeahead -+ -+ , select: function () { -+ var val = this.$menu.find('.active').attr('data-value') -+ this.$element -+ .val(this.updater(val)) -+ .change() -+ return this.hide() -+ } -+ -+ , updater: function (item) { -+ return item -+ } -+ -+ , show: function () { -+ var pos = $.extend({}, this.$element.position(), { -+ height: this.$element[0].offsetHeight -+ }) -+ -+ this.$menu -+ .insertAfter(this.$element) -+ .css({ -+ top: pos.top + pos.height -+ , left: pos.left -+ }) -+ .show() -+ -+ this.shown = true -+ return this -+ } -+ -+ , hide: function () { -+ this.$menu.hide() -+ this.shown = false -+ return this -+ } -+ -+ , lookup: function (event) { -+ var items -+ -+ this.query = this.$element.val() -+ -+ if (!this.query || this.query.length < this.options.minLength) { -+ return this.shown ? this.hide() : this -+ } -+ -+ items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source -+ -+ return items ? this.process(items) : this -+ } -+ -+ , process: function (items) { -+ var that = this -+ -+ items = $.grep(items, function (item) { -+ return that.matcher(item) -+ }) -+ -+ items = this.sorter(items) -+ -+ if (!items.length) { -+ return this.shown ? this.hide() : this -+ } -+ -+ return this.render(items.slice(0, this.options.items)).show() -+ } -+ -+ , matcher: function (item) { -+ return ~item.toLowerCase().indexOf(this.query.toLowerCase()) -+ } -+ -+ , sorter: function (items) { -+ var beginswith = [] -+ , caseSensitive = [] -+ , caseInsensitive = [] -+ , item -+ -+ while (item = items.shift()) { -+ if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) -+ else if (~item.indexOf(this.query)) caseSensitive.push(item) -+ else caseInsensitive.push(item) -+ } -+ -+ return beginswith.concat(caseSensitive, caseInsensitive) -+ } -+ -+ , highlighter: function (item) { -+ var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') -+ return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { -+ return '' + match + '' -+ }) -+ } -+ -+ , render: function (items) { -+ var that = this -+ -+ items = $(items).map(function (i, item) { -+ i = $(that.options.item).attr('data-value', item) -+ i.find('a').html(that.highlighter(item)) -+ return i[0] -+ }) -+ -+ items.first().addClass('active') -+ this.$menu.html(items) -+ return this -+ } -+ -+ , 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)) -+ } -+ -+ , 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 -+ e.preventDefault() -+ this.prev() -+ break -+ -+ case 40: // down arrow -+ e.preventDefault() -+ this.next() -+ break -+ } -+ -+ e.stopPropagation() -+ } -+ -+ , keydown: function (e) { -+ this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) -+ 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.stopPropagation() -+ e.preventDefault() -+ } -+ -+ , focus: function (e) { -+ this.focused = true -+ } -+ -+ , blur: function (e) { -+ this.focused = false -+ if (!this.mousedover && this.shown) this.hide() -+ } -+ -+ , click: function (e) { -+ e.stopPropagation() -+ 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) { -+ 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') data[option]() -+ }) -+ } -+ -+ $.fn.typeahead.defaults = { -+ source: [] -+ , items: 8 -+ , menu: '
    ' -+ , item: '
    • ' -+ , minLength: 1 -+ } -+ -+ $.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()) -+ }) -+ -+}(window.jQuery); -+/* ========================================================== -+ * bootstrap-affix.js v2.3.0 -+ * http://twitter.github.com/bootstrap/javascript.html#affix -+ * ========================================================== -+ * Copyright 2012 Twitter, Inc. -+ * -+ * 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 ($) { -+ -+ "use strict"; // jshint ;_; -+ -+ -+ /* AFFIX CLASS DEFINITION -+ * ====================== */ -+ -+ var Affix = function (element, options) { -+ this.options = $.extend({}, $.fn.affix.defaults, options) -+ this.$window = $(window) -+ .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) -+ .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) -+ this.$element = $(element) -+ this.checkPosition() -+ } -+ -+ Affix.prototype.checkPosition = function () { -+ if (!this.$element.is(':visible')) return -+ -+ var scrollHeight = $(document).height() -+ , scrollTop = this.$window.scrollTop() -+ , position = this.$element.offset() -+ , offset = this.options.offset -+ , offsetBottom = offset.bottom -+ , offsetTop = offset.top -+ , reset = 'affix affix-top affix-bottom' -+ , affix -+ -+ if (typeof offset != 'object') offsetBottom = offsetTop = offset -+ if (typeof offsetTop == 'function') offsetTop = offset.top() -+ if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() -+ -+ affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? -+ false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? -+ 'bottom' : offsetTop != null && scrollTop <= offsetTop ? -+ 'top' : false -+ -+ if (this.affixed === affix) return -+ -+ this.affixed = affix -+ this.unpin = affix == 'bottom' ? position.top - scrollTop : null -+ -+ this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) -+ } -+ -+ -+ /* AFFIX PLUGIN DEFINITION -+ * ======================= */ -+ -+ var old = $.fn.affix -+ -+ $.fn.affix = function (option) { -+ return this.each(function () { -+ var $this = $(this) -+ , data = $this.data('affix') -+ , options = typeof option == 'object' && option -+ if (!data) $this.data('affix', (data = new Affix(this, options))) -+ if (typeof option == 'string') data[option]() -+ }) -+ } -+ -+ $.fn.affix.Constructor = Affix -+ -+ $.fn.affix.defaults = { -+ offset: 0 -+ } -+ -+ -+ /* AFFIX NO CONFLICT -+ * ================= */ -+ -+ $.fn.affix.noConflict = function () { -+ $.fn.affix = old -+ return this -+ } -+ -+ -+ /* AFFIX DATA-API -+ * ============== */ -+ -+ $(window).on('load', function () { -+ $('[data-spy="affix"]').each(function () { -+ var $spy = $(this) -+ , data = $spy.data() -+ -+ data.offset = data.offset || {} -+ -+ data.offsetBottom && (data.offset.bottom = data.offsetBottom) -+ data.offsetTop && (data.offset.top = data.offsetTop) -+ -+ $spy.affix(data) -+ }) -+ }) -+ -+ -+}(window.jQuery); -\ No newline at end of file diff -Nru django-guardian-1.1.1/debian/patches/hoge django-guardian-1.2.0/debian/patches/hoge --- django-guardian-1.1.1/debian/patches/hoge 2014-01-29 23:42:51.000000000 +0000 +++ django-guardian-1.2.0/debian/patches/hoge 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: django-guardian-1.1.1/docs/conf.py -=================================================================== ---- django-guardian-1.1.1.orig/docs/conf.py 2014-01-30 08:34:08.000000000 +0900 -+++ django-guardian-1.1.1/docs/conf.py 2014-01-30 08:42:46.713767885 +0900 -@@ -21,6 +21,7 @@ - os.environ['DJANGO_SETTINGS_MODULE'] = 'guardian.testsettings' - ANONYMOUS_USER_ID = -1 # Required by guardian - guardian = __import__('guardian') -+from guardian.admin import GuardedModelAdmin - - # -- General configuration ----------------------------------------------------- - diff -Nru django-guardian-1.1.1/debian/patches/series django-guardian-1.2.0/debian/patches/series --- django-guardian-1.1.1/debian/patches/series 2014-01-29 23:43:30.000000000 +0000 +++ django-guardian-1.2.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -append_uncompressed_js_libraries.patch diff -Nru django-guardian-1.1.1/debian/python-django-guardian-doc.doc-base django-guardian-1.2.0/debian/python-django-guardian-doc.doc-base --- django-guardian-1.1.1/debian/python-django-guardian-doc.doc-base 2013-09-30 06:00:14.000000000 +0000 +++ django-guardian-1.2.0/debian/python-django-guardian-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Document: python-django-guardian -Title: Debian django-guardian Manual -Author: -Abstract: This documentation gives an introduction - to django-guardian and references. -Section: Programming/Python - -Format: HTML -Index: /usr/share/doc/python-django-guardian-doc/html/index.html -Files: /usr/share/doc/python-django-guardian-doc/html/*.html - /usr/share/doc/python-django-guardian-doc/html/api/*.html - /usr/share/doc/python-django-guardian-doc/html/develop/*.html - /usr/share/doc/python-django-guardian-doc/html/userguide/*.html diff -Nru django-guardian-1.1.1/debian/python-django-guardian-doc.docs django-guardian-1.2.0/debian/python-django-guardian-doc.docs --- django-guardian-1.1.1/debian/python-django-guardian-doc.docs 2013-09-27 14:53:06.000000000 +0000 +++ django-guardian-1.2.0/debian/python-django-guardian-doc.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -docs/build/html diff -Nru django-guardian-1.1.1/debian/python-django-guardian-doc.links django-guardian-1.2.0/debian/python-django-guardian-doc.links --- django-guardian-1.1.1/debian/python-django-guardian-doc.links 2013-09-30 06:33:30.000000000 +0000 +++ django-guardian-1.2.0/debian/python-django-guardian-doc.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/python-django-guardian-doc/html/_static/underscore.js -usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/python-django-guardian-doc/html/_static/jquery.js -usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/python-django-guardian-doc/html/_static/searchtools.js -usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/python-django-guardian-doc/html/_static/doctools.js -usr/share/sphinx/themes/basic/static/websupport.js usr/share/doc/python-django-guardian-doc/html/_static/websupport.js -usr/share/sphinx/themes/basic/static/ajax-loader.gif usr/share/doc/python-django-guardian-doc/html/_static/ajax-loader.gif -usr/share/sphinx/themes/basic/static/comment.png usr/share/doc/python-django-guardian-doc/html/_static/comment.png -usr/share/sphinx/themes/basic/static/comment-bright.png usr/share/doc/python-django-guardian-doc/html/_static/comment-bright.png -usr/share/sphinx/themes/basic/static/comment-close.png usr/share/doc/python-django-guardian-doc/html/_static/comment-close.png -usr/share/sphinx/themes/basic/static/down.png usr/share/doc/python-django-guardian-doc/html/_static/down.png -usr/share/sphinx/themes/basic/static/down-pressed.png usr/share/doc/python-django-guardian-doc/html/_static/down-pressed.png -usr/share/sphinx/themes/basic/static/file.png usr/share/doc/python-django-guardian-doc/html/_static/file.png -usr/share/sphinx/themes/basic/static/minus.png usr/share/doc/python-django-guardian-doc/html/_static/minus.png -usr/share/sphinx/themes/basic/static/plus.png usr/share/doc/python-django-guardian-doc/html/_static/plus.png - diff -Nru django-guardian-1.1.1/debian/python-django-guardian.examples django-guardian-1.2.0/debian/python-django-guardian.examples --- django-guardian-1.1.1/debian/python-django-guardian.examples 2014-01-29 23:10:13.000000000 +0000 +++ django-guardian-1.2.0/debian/python-django-guardian.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -example_project/ -benchmarks/ diff -Nru django-guardian-1.1.1/debian/rules django-guardian-1.2.0/debian/rules --- django-guardian-1.1.1/debian/rules 2014-01-30 09:54:20.000000000 +0000 +++ django-guardian-1.2.0/debian/rules 2014-07-22 09:46:56.000000000 +0000 @@ -1,40 +1,9 @@ #!/usr/bin/make -f -# -*- makefile -*- -#export DH_VERBOSE=1 -export PYTHONPATH := $(CURDIR) -%: - dh $@ --with python2,quilt - -override_dh_auto_build: - python setup.py build - - # Build the HTML documentation. - cd $(CURDIR)/docs/ && make html - # rename file license.txt - mv -f $(CURDIR)/docs/build/html/_sources/license.txt \ - $(CURDIR)/docs/build/html/_sources/lic.txt - sed -i 's:href="_sources/license.txt":href="_sources/lic.txt":g' \ - $(CURDIR)/docs/build/html/license.html - rm -rf $(CURDIR)/docs/guardian +# This file was automatically generated by stdeb 0.6.0+git at +# Tue, 22 Jul 2014 09:46:56 +0000 -override_dh_auto_test: - set -e ;\ - python $(CURDIR)/setup.py test - -override_dh_auto_install: - python setup.py install --no-compile -O0 --install-layout=deb \ - --root $(CURDIR)/debian/python-django-guardian - find $(CURDIR)/debian/ -type d -name benchmarks | xargs rm -rf - find $(CURDIR)/debian/ -type d -name example_project | xargs rm -rf - -override_dh_installchangelogs: - dh_installchangelogs CHANGES +%: + dh $@ --with python2 --buildsystem=python_distutils -override_dh_auto_clean: - dh_clean - find $(CURDIR)/ -name "*.pyc" -delete - rm -rf $(CURDIR)/django_guardian.egg-info - rm -rf $(CURDIR)/build - rm -rf $(CURDIR)/docs/build diff -Nru django-guardian-1.1.1/debian/source/options django-guardian-1.2.0/debian/source/options --- django-guardian-1.1.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/debian/source/options 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore="\.egg-info" \ No newline at end of file diff -Nru django-guardian-1.1.1/debian/watch django-guardian-1.2.0/debian/watch --- django-guardian-1.1.1/debian/watch 2013-09-27 14:23:55.000000000 +0000 +++ django-guardian-1.2.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -version=3 -https://pypi.python.org/packages/source/d/django-guardian/django-guardian-(.*)\.tar\.gz diff -Nru django-guardian-1.1.1/django_guardian.egg-info/dependency_links.txt django-guardian-1.2.0/django_guardian.egg-info/dependency_links.txt --- django-guardian-1.1.1/django_guardian.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/dependency_links.txt 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru django-guardian-1.1.1/django_guardian.egg-info/not-zip-safe django-guardian-1.2.0/django_guardian.egg-info/not-zip-safe --- django-guardian-1.1.1/django_guardian.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/not-zip-safe 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru django-guardian-1.1.1/django_guardian.egg-info/PKG-INFO django-guardian-1.2.0/django_guardian.egg-info/PKG-INFO --- django-guardian-1.1.1/django_guardian.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/PKG-INFO 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1,127 @@ +Metadata-Version: 1.1 +Name: django-guardian +Version: 1.2.0 +Summary: Implementation of per object permissions for Django 1.2 or later. +Home-page: http://github.com/lukaszb/django-guardian +Author: Lukasz Balcerzak +Author-email: lukaszbalcerzak@gmail.com +License: BSD +Download-URL: https://github.com/lukaszb/django-guardian/tags +Description: =============== + django-guardian + =============== + + .. image:: https://secure.travis-ci.org/lukaszb/django-guardian.png?branch=master + :target: http://travis-ci.org/lukaszb/django-guardian + + .. image:: https://coveralls.io/repos/lukaszb/django-guardian/badge.png?branch=master + :target: https://coveralls.io/r/lukaszb/django-guardian/ + + .. image:: https://pypip.in/v/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + + .. image:: https://pypip.in/d/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + + + ``django-guardian`` is implementation of per object permissions [1]_ as + authorization backend which is supported since Django_ 1.2. It won't + work with older Django_ releases. + + Documentation + ------------- + + Online documentation is available at http://django-guardian.rtfd.org/. + + Installation + ------------ + + To install ``django-guardian`` simply run:: + + pip install django-guardian + + Configuration + ------------- + + We need to hook ``django-guardian`` into our project. + + 1. Put ``guardian`` into your ``INSTALLED_APPS`` at settings module:: + + INSTALLED_APPS = ( + ... + 'guardian', + ) + + 2. Add extra authorization backend:: + + AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', # default + 'guardian.backends.ObjectPermissionBackend', + ) + + 3. Configure anonymous user ID :: + + ANONYMOUS_USER_ID = -1 + + + Usage + ----- + + After installation and project hooks we can finally use object permissions + with Django_. + + Lets start really quickly:: + + >>> jack = User.objects.create_user('jack', 'jack@example.com', 'topsecretagentjack') + >>> admins = Group.objects.create(name='admins') + >>> jack.has_perm('change_group', admins) + False + >>> UserObjectPermission.objects.assign_perm('change_group', user=jack, obj=admins) + + >>> jack.has_perm('change_group', admins) + True + + Of course our agent jack here would not be able to *change_group* globally:: + + >>> jack.has_perm('change_group') + False + + Admin integration + ----------------- + + Replace ``admin.ModelAdmin`` with ``GuardedModelAdmin`` for those models + which should have object permissions support within admin panel. + + For example:: + + from django.contrib import admin + from myapp.models import Author + from guardian.admin import GuardedModelAdmin + + # Old way: + #class AuthorAdmin(admin.ModelAdmin): + # pass + + # With object permissions support + class AuthorAdmin(GuardedModelAdmin): + pass + + admin.site.register(Author, AuthorAdmin) + + + .. [1] Great paper about this feature is available at `djangoadvent articles `_. + + .. _Django: http://www.djangoproject.com/ + + +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Environment :: Web Environment +Classifier: Framework :: Django +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: BSD License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Topic :: Security +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 3 diff -Nru django-guardian-1.1.1/django_guardian.egg-info/requires.txt django-guardian-1.2.0/django_guardian.egg-info/requires.txt --- django-guardian-1.1.1/django_guardian.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/requires.txt 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1,2 @@ +Django +six \ No newline at end of file diff -Nru django-guardian-1.1.1/django_guardian.egg-info/SOURCES.txt django-guardian-1.2.0/django_guardian.egg-info/SOURCES.txt --- django-guardian-1.1.1/django_guardian.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/SOURCES.txt 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1,139 @@ +CHANGES +LICENSE +MANIFEST.in +README.rst +extras.py +run_test_and_report.sh +setup.cfg +setup.py +tests.py +django_guardian.egg-info/PKG-INFO +django_guardian.egg-info/SOURCES.txt +django_guardian.egg-info/dependency_links.txt +django_guardian.egg-info/not-zip-safe +django_guardian.egg-info/requires.txt +django_guardian.egg-info/top_level.txt +docs/Makefile +docs/conf.py +docs/configuration.rst +docs/exts.py +docs/index.rst +docs/installation.rst +docs/license.rst +docs/make.bat +docs/overview.rst +docs/watch-docs.sh +docs/api/guardian.admin.rst +docs/api/guardian.backends.rst +docs/api/guardian.core.rst +docs/api/guardian.decorators.rst +docs/api/guardian.forms.rst +docs/api/guardian.management.commands.rst +docs/api/guardian.managers.rst +docs/api/guardian.mixins.rst +docs/api/guardian.models.rst +docs/api/guardian.shortcuts.rst +docs/api/guardian.templatetags.guardian_tags.rst +docs/api/guardian.utils.rst +docs/api/index.rst +docs/develop/changes.rst +docs/develop/example_project.rst +docs/develop/index.rst +docs/develop/overview.rst +docs/develop/supported-versions.rst +docs/develop/testing.rst +docs/theme/rtd_theme/breadcrumbs.html +docs/theme/rtd_theme/footer.html +docs/theme/rtd_theme/layout.html +docs/theme/rtd_theme/layout_old.html +docs/theme/rtd_theme/search.html +docs/theme/rtd_theme/searchbox.html +docs/theme/rtd_theme/theme.conf +docs/theme/rtd_theme/versions.html +docs/theme/rtd_theme/sass/_badge.sass +docs/theme/rtd_theme/sass/_badge_font_awesome_mini.sass +docs/theme/rtd_theme/sass/_breadcrumbs.sass +docs/theme/rtd_theme/sass/_nav.sass +docs/theme/rtd_theme/sass/badge_only.sass +docs/theme/rtd_theme/sass/config.rb +docs/theme/rtd_theme/sass/theme.sass +docs/theme/rtd_theme/static/badge_only.css +docs/theme/rtd_theme/static/theme.css +docs/theme/rtd_theme/static/theme.js +docs/theme/rtd_theme/static/font/fontawesome_webfont.eot +docs/theme/rtd_theme/static/font/fontawesome_webfont.svg +docs/theme/rtd_theme/static/font/fontawesome_webfont.ttf +docs/theme/rtd_theme/static/font/fontawesome_webfont.woff +docs/userguide/admin-integration.rst +docs/userguide/assign.rst +docs/userguide/caveats.rst +docs/userguide/check.rst +docs/userguide/custom-user-model.rst +docs/userguide/index.rst +docs/userguide/performance.rst +docs/userguide/remove.rst +guardian/__init__.py +guardian/admin.py +guardian/apps.py +guardian/backends.py +guardian/compat.py +guardian/core.py +guardian/decorators.py +guardian/exceptions.py +guardian/forms.py +guardian/managers.py +guardian/mixins.py +guardian/models.py +guardian/shortcuts.py +guardian/testsettings.py +guardian/utils.py +guardian/conf/__init__.py +guardian/conf/settings.py +guardian/locale/es/LC_MESSAGES/django.mo +guardian/locale/es/LC_MESSAGES/django.po +guardian/locale/pl/LC_MESSAGES/django.mo +guardian/locale/pl/LC_MESSAGES/django.po +guardian/locale/pt_BR/LC_MESSAGES/django.mo +guardian/locale/pt_BR/LC_MESSAGES/django.po +guardian/management/__init__.py +guardian/management/commands/__init__.py +guardian/management/commands/clean_orphan_obj_perms.py +guardian/migrations/0001_initial.py +guardian/migrations/0002_auto__add_field_groupobjectpermission_object_pk__add_field_userobjectp.py +guardian/migrations/0003_update_objectpermission_object_pk.py +guardian/migrations/0004_auto__del_field_groupobjectpermission_object_id__del_unique_groupobjec.py +guardian/migrations/0005_auto__chg_field_groupobjectpermission_object_pk__chg_field_userobjectp.py +guardian/migrations/__init__.py +guardian/templates/admin/guardian/contrib/grappelli/field.html +guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage.html +guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html +guardian/templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html +guardian/templates/admin/guardian/model/change_form.html +guardian/templates/admin/guardian/model/field.html +guardian/templates/admin/guardian/model/obj_perms_manage.html +guardian/templates/admin/guardian/model/obj_perms_manage_group.html +guardian/templates/admin/guardian/model/obj_perms_manage_user.html +guardian/templates/admin/guardian/model/obj_perms_no.html +guardian/templates/admin/guardian/model/obj_perms_yes.html +guardian/templatetags/__init__.py +guardian/templatetags/guardian_tags.py +guardian/testapp/__init__.py +guardian/testapp/models.py +guardian/testapp/tests/__init__.py +guardian/testapp/tests/admin_test.py +guardian/testapp/tests/conf.py +guardian/testapp/tests/conf_test.py +guardian/testapp/tests/core_test.py +guardian/testapp/tests/custompkmodel_test.py +guardian/testapp/tests/decorators_test.py +guardian/testapp/tests/direct_rel_test.py +guardian/testapp/tests/forms_test.py +guardian/testapp/tests/management_test.py +guardian/testapp/tests/managers_test.py +guardian/testapp/tests/mixins_test.py +guardian/testapp/tests/orphans_test.py +guardian/testapp/tests/other_test.py +guardian/testapp/tests/shortcuts_test.py +guardian/testapp/tests/tags_test.py +guardian/testapp/tests/urls.py +guardian/testapp/tests/utils_test.py \ No newline at end of file diff -Nru django-guardian-1.1.1/django_guardian.egg-info/top_level.txt django-guardian-1.2.0/django_guardian.egg-info/top_level.txt --- django-guardian-1.1.1/django_guardian.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/django_guardian.egg-info/top_level.txt 2014-07-22 09:46:56.000000000 +0000 @@ -0,0 +1,3 @@ +guardian +benchmarks +example_project diff -Nru django-guardian-1.1.1/docs/configuration.rst django-guardian-1.2.0/docs/configuration.rst --- django-guardian-1.1.1/docs/configuration.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/configuration.rst 2014-07-22 09:46:34.000000000 +0000 @@ -29,6 +29,10 @@ ``syncdb`` management command would create ``User`` instance for anonymous user support (with name of ``AnonymousUser``). +If ``ANONYMOUS_USER_ID`` is set to ``None``, anonymous user object permissions +are disabled. You may need to choose this option if creating a ``User`` object +to represent anonymous users would be problematic in your environment. + We can change id to whatever we like. Project should be now ready to use object permissions. @@ -36,7 +40,7 @@ Optional settings ================= -In addition to requried ``ANONYMOUS_USER_ID`` setting, guardian has following, +In addition to required ``ANONYMOUS_USER_ID`` setting, guardian has following, optional configuration variables: @@ -104,3 +108,22 @@ .. seealso:: https://docs.djangoproject.com/en/1.5/topics/auth/customizing/#substituting-a-custom-user-model + +.. setting:: GUARDIAN_GET_INIT_ANONYMOUS_USER + +GUARDIAN_GET_INIT_ANONYMOUS_USER +-------------------------------- + +.. versionadded:: 1.2 + +Guardian supports object level permissions for anonymous users, however when +in our project we use custom User model, default function might fail. This can +lead to issues as ``guardian`` tries to create anonymous user after each +``syncdb`` call. Object that is going to be created is retrieved using function +pointed by this setting. Once retrieved, ``save`` method would be called on +that instance. + +Defaults to ``"guardian.management.get_init_anonymous_user"``. + + +.. seealso:: :ref:`custom-user-model-anonymous` diff -Nru django-guardian-1.1.1/docs/conf.py django-guardian-1.2.0/docs/conf.py --- django-guardian-1.1.1/docs/conf.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/conf.py 2014-07-22 09:46:34.000000000 +0000 @@ -51,7 +51,7 @@ # General information about the project. project = u'django-guardian' -copyright = u'2010-2012, Lukasz Balcerzak' +copyright = u'2010-2013, Lukasz Balcerzak' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -106,7 +106,8 @@ # Sphinx are currently 'default' and 'sphinxdoc'. #html_theme = 'default' # Theme URL: https://github.com/coordt/ADCtheme/ -html_theme = 'ADCtheme' +RTD_NEW_THEME = True +html_theme = 'rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -135,7 +136,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = [] +html_static_path = ['theme/rtd_theme/static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff -Nru django-guardian-1.1.1/docs/develop/example_project.rst django-guardian-1.2.0/docs/develop/example_project.rst --- django-guardian-1.1.1/docs/develop/example_project.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/develop/example_project.rst 2014-07-22 09:46:34.000000000 +0000 @@ -21,3 +21,8 @@ Project is really basic and shows almost nothing but eventually it should expose some ``django-guardian`` functionality. + +.. note:: + Example project must be run with Django 1.5 or later. This is to ensure that + custom user model can be used. + diff -Nru django-guardian-1.1.1/docs/develop/index.rst django-guardian-1.2.0/docs/develop/index.rst --- django-guardian-1.1.1/docs/develop/index.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/develop/index.rst 2014-07-22 09:46:34.000000000 +0000 @@ -4,7 +4,8 @@ =========== .. toctree:: - + + overview example_project testing supported-versions diff -Nru django-guardian-1.1.1/docs/develop/overview.rst django-guardian-1.2.0/docs/develop/overview.rst --- django-guardian-1.1.1/docs/develop/overview.rst 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/develop/overview.rst 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,76 @@ +.. _dev_overview: + +Overview +======== + +Here we describe the development process overview. It's in F.A.Q. format to +make it simple. + + +Why devel is default branch? +---------------------------- + +Since version 1.2 we try to make ``master`` in a production-ready state. It +does NOT mean it is production ready, but it SHOULD be. In example, tests at +``master`` should always pass. Actually, whole tox suite should pass. And it's +test coverage should be at 100% level. + +``devel`` branch, on the other hand, can break. It shouldn't but it is +acceptable. As a user, you should NEVER use non-master branches at production. +All the changes are pushed from ``devel`` to ``master`` before next release. It +might happen more frequently. + + +How to file a ticket? +--------------------- + +Just go to https://github.com/lukaszb/django-guardian/issues and create new +one. + + +How do I get involved? +---------------------- + +It's simple! If you want to fix a bug, extend documentation or whatever you +think is appropriate for the project and involves changes, just fork the +project at github (https://github.com/lukaszb/django-guardian), create a +separate branch, hack on it, publish changes at your fork and create a pull +request. + +Here is a quick how to: + +1. Fork a project: https://github.com/lukaszb/django-guardian/fork +2. Checkout project to your local machine:: + + $ git clone git@github.com:YOUR_NAME/django-guardian.git + +3. Create a new branch with name describing change you are going to work on:: + + $ git checkout -b bugfix/support-for-custom-model + +4. Perform changes at newly created branch. Remember to include tests (if this + is code related change) and run test suite. See :ref:`running tests documentation + `. Also, remember to add yourself to the ``AUTHORS`` file. +5. (Optional) Squash commits. If you have multiple commits and it doesn't make + much sense to have them separated (and it usually makes little sense), + please consider merging all changes into single commit. Please see + https://help.github.com/articles/interactive-rebase if you need help with + that. +6. Publish changes:: + + $ git push origin YOUR_BRANCH_NAME + +6. Create a Pull Request (https://help.github.com/articles/creating-a-pull-request). + Usually it's as simple as opening up https://github.com/YOUR_NAME/django-guardian + and clicking on review button for newly created branch. There you can make + final review of your changes and if everything seems fine, create a Pull + Request. + + +Why my issue/pull request was closed? +------------------------------------- + +We usually put an explonation while we close issue or PR. It might be for +various reasons, i.e. there were no reply for over a month after our last +comment, there were no tests for the changes etc. + diff -Nru django-guardian-1.1.1/docs/develop/supported-versions.rst django-guardian-1.2.0/docs/develop/supported-versions.rst --- django-guardian-1.1.1/docs/develop/supported-versions.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/develop/supported-versions.rst 2014-07-22 09:46:34.000000000 +0000 @@ -3,17 +3,22 @@ Supported versions ================== -``django-guardian`` supports Python 2.6/2.7 and Django 1.2+. Also, we support +``django-guardian`` supports Python 2.6+/3.3+ and Django 1.3+. Also, we support ``django-grappelli`` 2.3.5. +.. note:: + ``django-grappelli`` support was an experiment. We are not going to maintain + this support starting with version 1.2. It means that since v1.2 grappelli + parts within guardian would be deprecated. And removed before next big + release (which most probably would be 2.0). + Rules ----- -1. We would support both Python 2.7 and Python 2.6 (until Django drops support - for 2.6, if ever). -2. We would support **two latest Django stable versions**. In example: once - Django 1.4 would become final, we are dropping support for Django 1.2 as - two last stable versions would be 1.3 and 1.4. -3. Support for ``django-grappelli`` is somewhat experimental. Nevertheless, - our intention is **to support django-grappelli last stable version**. +* We would support Python 2.7 and Python 2.6 (until Django drops support for + 2.6). Since Django 1.5 we also support Python 3.3+. +* We support Django 1.3+, however next big ``guardian`` release (v2.0) we would + support Django 1.6+ (or higher, depending on the date guardian v2.0 would be + released). This is due to many simplifications in code we could do. There is + also a chance that v2.0 would drop support for Python 2.X. diff -Nru django-guardian-1.1.1/docs/develop/testing.rst django-guardian-1.2.0/docs/develop/testing.rst --- django-guardian-1.1.1/docs/develop/testing.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/develop/testing.rst 2014-07-22 09:46:34.000000000 +0000 @@ -22,6 +22,7 @@ library), please **DO NOT** create a public issue but contact me directly (lukaszbalcerzak@gmail.com). + Running tests ------------- @@ -33,6 +34,7 @@ $ python manage.py test guardian + Coverage support ---------------- @@ -75,6 +77,7 @@ ------------------------------------------------------------------- TOTAL 231 231 100% + Tox --- diff -Nru django-guardian-1.1.1/docs/index.rst django-guardian-1.2.0/docs/index.rst --- django-guardian-1.1.1/docs/index.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/index.rst 2014-07-22 09:46:34.000000000 +0000 @@ -5,6 +5,7 @@ ===================================================== :Date: |today| +:Version: |version| **Documentation**: diff -Nru django-guardian-1.1.1/docs/installation.rst django-guardian-1.2.0/docs/installation.rst --- django-guardian-1.1.1/docs/installation.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/installation.rst 2014-07-22 09:46:34.000000000 +0000 @@ -3,7 +3,7 @@ Installation ============ -This application requires Django_ 1.2 or higher and it is only prerequisite +This application requires Django_ 1.3 or higher and it is only prerequisite before ``django-guardian`` may be used. In order to install ``django-guardian`` simply use ``pip``:: diff -Nru django-guardian-1.1.1/docs/overview.rst django-guardian-1.2.0/docs/overview.rst --- django-guardian-1.1.1/docs/overview.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/overview.rst 2014-07-22 09:46:49.000000000 +0000 @@ -12,7 +12,7 @@ - Object permissions for Django_ - AnonymousUser support - High level API -- Heavely tested +- Heavily tested - Django's admin integration - Decorators diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/layout.html django-guardian-1.2.0/docs/theme/ADCtheme/layout.html --- django-guardian-1.1.1/docs/theme/ADCtheme/layout.html 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/layout.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -{% extends "basic/layout.html" %} -{%- block doctype -%} - -{%- endblock %} -{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} -{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} -{%- block linktags %} - {%- if hasdoc('about') %} - - {%- endif %} - {%- if hasdoc('genindex') %} - - {%- endif %} - {%- if hasdoc('search') %} - - {%- endif %} - {%- if hasdoc('copyright') %} - - {%- endif %} - - {%- if parents %} - - {%- endif %} - {%- if next %} - - {%- endif %} - {%- if prev %} - - {%- endif %} - -{%- endblock %} -{%- block extrahead %} {% endblock %} -{%- block header %}{% endblock %} -{%- block relbar1 %} -
    -

    {{docstitle}}

    -
    - -{% endblock %} - -{%- block sidebar1 %} -{%- if not embedded %}{% if not theme_nosidebar|tobool %} -
    -
    - {%- block sidebarlogo %} - {%- if logo %} - - {%- endif %} - {%- endblock %} - {%- block sidebartoc %} - - {{ toctree() }} - {%- endblock %} - {%- block sidebarrel %} - {%- endblock %} - {%- block sidebarsourcelink %} - {%- if show_source and has_source and sourcename %} -

    {{ _('This Page') }}

    - - {%- endif %} - {%- endblock %} - {%- if customsidebar %} - {% include customsidebar %} - {%- endif %} - {%- block sidebarsearch %} - {%- if pagename != "search" %} - - - {%- endif %} - {%- endblock %} -
    -
    -{%- endif %}{% endif %} - -{% endblock %} -{%- block document %} -
    - {%- if not embedded %}{% if not theme_nosidebar|tobool %} -
    - {%- endif %}{% endif %} -
    - {% block body %} {% endblock %} -
    - {%- if not embedded %}{% if not theme_nosidebar|tobool %} -
    - {%- endif %}{% endif %} -
    -
    -

    {%- if hasdoc('copyright') %} - {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} - {%- else %} - {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} - {%- endif %} - {%- if last_updated %} - {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %} - {%- endif %} - {%- if show_sphinx %} - {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} - {%- endif %} -

    -
    -{%- endblock %} -{%- block sidebar2 %}{% endblock %} -{%- block relbar2 %}{% endblock %} -{%- block footer %} - - -{%- endblock %} diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/LICENSE django-guardian-1.2.0/docs/theme/ADCtheme/LICENSE --- django-guardian-1.1.1/docs/theme/ADCtheme/LICENSE 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/LICENSE 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Copyright (c) 2009, Corey Oordt -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of Corey Oordt nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/static/adctheme.css django-guardian-1.2.0/docs/theme/ADCtheme/static/adctheme.css --- django-guardian-1.1.1/docs/theme/ADCtheme/static/adctheme.css 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/static/adctheme.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,755 +0,0 @@ -/** - * Sphinx stylesheet -- basic theme - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - h3 { - color:#000000; - font-size: 17px; - margin-bottom:0.5em; - margin-top:2em; - } -/* -- main layout ----------------------------------------------------------- */ - -div.clearer { - clear: both; -} - -/* -- header ---------------------------------------------------------------- */ - -#header #title { - background:#29334F url(title_background.png) repeat-x scroll 0 0; - border-bottom:1px solid #B6B6B6; - height:25px; - overflow:hidden; -} -#headerButtons { - position: absolute; - list-style: none outside; - top: 26px; - left: 0px; - right: 0px; - margin: 0px; - padding: 0px; - border-top: 1px solid #2B334F; - border-bottom: 1px solid #EDEDED; - height: 20px; - font-size: 8pt; - overflow: hidden; - background-color: #D8D8D8; -} - -#headerButtons li { - background-repeat:no-repeat; - display:inline; - margin-top:0; - padding:0; -} - -.headerButton { - display: inline; - height:20px; -} - -.headerButton a { - text-decoration: none; - float: right; - height: 20px; - padding: 4px 15px; - border-left: 1px solid #ACACAC; - font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; - color: black; -} -.headerButton a:hover { - color: white; - background-color: #787878; - -} - -li#toc_button { - text-align:left; -} - -li#toc_button .headerButton a { - width:198px; - padding-top: 4px; - font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; - color: black; - float: left; - padding-left:15px; - border-right:1px solid #ACACAC; - background:transparent url(triangle_open.png) no-repeat scroll 4px 6px; -} - -li#toc_button .headerButton a:hover { - background-color: #787878; - color: white; -} - -li#page_buttons { -position:absolute; -right:0; -} - -#breadcrumbs { - color: black; - background-image:url(breadcrumb_background.png); - border-top:1px solid #2B334F; - bottom:0; - font-size:10px; - height:15px; - left:0; - overflow:hidden; - padding:3px 10px 0; - position:absolute; - right:0; - white-space:nowrap; - z-index:901; -} -#breadcrumbs a { - color: black; - text-decoration: none; -} -#breadcrumbs a:hover { - text-decoration: underline; -} -#breadcrumbs img { - padding-left: 3px; -} -/* -- sidebar --------------------------------------------------------------- */ -#sphinxsidebar { - position: absolute; - top: 84px; - bottom: 19px; - left: 0px; - width: 229px; - background-color: #E4EBF7; - border-right: 1px solid #ACACAC; - border-top: 1px solid #2B334F; - overflow-x: hidden; - overflow-y: auto; - padding: 0px 0px 0px 0px; - font-size:11px; -} - -div.sphinxsidebarwrapper { - padding: 10px 5px 0 10px; -} - -#sphinxsidebar li { - margin: 0px; - padding: 0px; - font-weight: normal; - margin: 0px 0px 7px 0px; - overflow: hidden; - text-overflow: ellipsis; - font-size: 11px; -} - -#sphinxsidebar ul { - list-style: none; - margin: 0px 0px 0px 0px; - padding: 0px 5px 0px 5px; -} - -#sphinxsidebar ul ul, -#sphinxsidebar ul.want-points { - list-style: square; -} - -#sphinxsidebar ul ul { - margin-top: 0; - margin-bottom: 0; -} - -#sphinxsidebar form { - margin-top: 10px; -} - -#sphinxsidebar input { - border: 1px solid #787878; - font-family: sans-serif; - font-size: 1em; -} - -img { - border: 0; -} - -#sphinxsidebar li.toctree-l1 a { - font-weight: bold; - color: #000; - text-decoration: none; -} - -#sphinxsidebar li.toctree-l2 a { - font-weight: bold; - color: #4f4f4f; - text-decoration: none; -} - -/* -- search page ----------------------------------------------------------- */ - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} -#sphinxsidebar input.prettysearch {border:none;} -input.searchbutton { - float: right; -} -.search-wrapper {width: 100%; height: 25px;} -.search-wrapper input.prettysearch { border: none; width:200px; height: 16px; background: url(searchfield_repeat.png) center top repeat-x; border: 0px; margin: 0; padding: 3px 0 0 0; font: 11px "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif; } -.search-wrapper input.prettysearch { width: 184px; margin-left: 20px; *margin-top:-1px; *margin-right:-2px; *margin-left:10px; } -.search-wrapper .search-left { display: block; position: absolute; width: 20px; height: 19px; background: url(searchfield_leftcap.png) left top no-repeat; } -.search-wrapper .search-right { display: block; position: relative; left: 204px; top: -19px; width: 10px; height: 19px; background: url(searchfield_rightcap.png) right top no-repeat; } - -/* -- index page ------------------------------------------------------------ */ - -table.contentstable { - width: 90%; -} - -table.contentstable p.biglink { - line-height: 150%; -} - -a.biglink { - font-size: 1.3em; -} - -span.linkdescr { - font-style: italic; - padding-top: 5px; - font-size: 90%; -} - -/* -- general index --------------------------------------------------------- */ - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -/* -- general body styles --------------------------------------------------- */ -.document { - border-top:1px solid #2B334F; - overflow:auto; - padding-left:2em; - padding-right:2em; - position:absolute; - z-index:1; - top:84px; - bottom:19px; - right:0; - left:230px; -} - -a.headerlink { - visibility: hidden; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: visible; -} - -div.body p.caption { - text-align: inherit; -} - -div.body td { - text-align: left; -} - -.field-list ul { - padding-left: 1em; -} - -.first { - margin-top: 0 !important; -} - -p.rubric { - margin-top: 30px; - font-weight: bold; -} - -/* -- sidebars -------------------------------------------------------------- */ - -/*div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; -} - -p.sidebar-title { - font-weight: bold; -} -*/ -/* -- topics ---------------------------------------------------------------- */ - -div.topic { - border: 1px solid #ccc; - padding: 7px 7px 0 7px; - margin: 10px 0 10px 0; -} - -p.topic-title { - font-size: 1.1em; - font-weight: bold; - margin-top: 10px; -} - -/* -- admonitions ----------------------------------------------------------- */ -.admonition { - border: 1px solid #a1a5a9; - background-color: #f7f7f7; - margin: 20px; - padding: 0px 8px 7px 9px; - text-align: left; -} -.warning { - background-color:#E8E8E8; - border:1px solid #111111; - margin:30px; -} -.admonition p { - font: 12px 'Lucida Grande', Geneva, Helvetica, Arial, sans-serif; - margin-top: 7px; - margin-bottom: 0px; -} - -div.admonition dt { - font-weight: bold; -} - -div.admonition dl { - margin-bottom: 0; -} - -p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; - padding-top: 3px; -} - -div.body p.centered { - text-align: center; - margin-top: 25px; -} - -/* -- tables ---------------------------------------------------------------- */ - -table.docutils { - border-collapse: collapse; - border: 1px solid #919699; - font-size:12px; - padding:8px; - text-align:left; - vertical-align:top; -} - -table.docutils td, table.docutils th { - padding: 8px; - font-size: 12px; - text-align: left; - vertical-align: top; - border-bottom: 1px solid #919699; -} - -table.docutils th { - font-weight: bold; -} -/* This alternates colors in up to six table rows (light blue for odd, white for even)*/ -.docutils tr { - background: #F0F5F9; -} - -.docutils tr + tr { - background: #FFFFFF; -} - -.docutils tr + tr + tr { - background: #F0F5F9; -} - -.docutils tr + tr + tr + tr { - background: #FFFFFF; -} - -.docutils tr + tr + tr +tr + tr { - background: #F0F5F9; -} - -.docutils tr + tr + tr + tr + tr + tr { - background: #FFFFFF; -} - -.docutils tr + tr + tr + tr + tr + tr + tr { - background: #F0F5F9; -} - -table.footnote td, table.footnote th { - border: 0 !important; -} - -th { - text-align: left; - padding-right: 5px; -} - -/* -- other body styles ----------------------------------------------------- */ - -dl { - margin-bottom: 15px; -} - -dd p { - margin-top: 0px; - font-size: 12px; -} - -dd ul, dd table { - margin-bottom: 10px; -} - -dd { - margin-top: 3px; - margin-bottom: 10px; - margin-left: 30px; - font-size: 12px; -} - -dt:target, .highlight { - background-color: #fbe54e; -} - -dl.glossary dt { - font-weight: bold; - font-size: 0.8em; -} - -dl.glossary dd { - font-size:12px; -} -.field-list ul { - vertical-align: top; - margin: 0; - padding-bottom: 0; - list-style: none inside; -} - -.field-list ul li { - margin-top: 0; -} - -.field-list p { - margin: 0; -} - -.refcount { - color: #060; -} - -.optional { - font-size: 1.3em; -} - -.versionmodified { - font-style: italic; -} - -.system-message { - background-color: #fda; - padding: 5px; - border: 3px solid red; -} - -.footnote:target { - background-color: #ffa -} - -/* -- code displays --------------------------------------------------------- */ - -pre { - overflow: auto; - background-color:#F1F5F9; - border:1px solid #C9D1D7; - border-spacing:0; - font-family:"Bitstream Vera Sans Mono",Monaco,"Lucida Console",Courier,Consolas,monospace; - font-size:11px; - padding: 10px; -} - -td.linenos pre { - padding: 5px 0px; - border: 0; - background-color: transparent; - color: #aaa; -} - -table.highlighttable { - margin-left: 0.5em; -} - -table.highlighttable td { - padding: 0 0.5em 0 0.5em; -} - -tt { - font-family:"Bitstream Vera Sans Mono",Monaco,"Lucida Console",Courier,Consolas,monospace; - -} - -tt.descname { - background-color: transparent; - font-weight: bold; - font-size: 1em; -} - -tt.descclassname { - background-color: transparent; -} - -tt.xref, a tt { - background-color: transparent; - font-weight: bold; -} - -h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { - background-color: transparent; -} - -/* -- math display ---------------------------------------------------------- */ - -img.math { - vertical-align: middle; -} - -div.body div.math p { - text-align: center; -} - -span.eqno { - float: right; -} - -/* -- printout stylesheet --------------------------------------------------- */ - -@media print { - div.document, - div.documentwrapper, - div.bodywrapper { - margin: 0; - width: 100%; - } - - div.sphinxsidebar, - div.related, - div.footer, - #top-link { - display: none; - } -} - -body { - font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; -} - -dl.class dt { - padding: 3px; -/* border-top: 2px solid #999;*/ -} - -em.property { - font-style: normal; -} - -dl.class dd p { - margin-top: 6px; -} - -dl.class dd dl.exception dt { - padding: 3px; - background-color: #FFD6D6; - border-top: none; -} - -dl.class dd dl.method dt { - padding: 3px; - background-color: #e9e9e9; - border-top: none; - -} - -dl.function dt { - padding: 3px; - border-top: 2px solid #999; -} - -ul { -list-style-image:none; -list-style-position:outside; -list-style-type:square; -margin:0 0 0 30px; -padding:0 0 12px 6px; -} -#docstitle { - height: 36px; - background-image: url(header_sm_mid.png); - left: 0; - top: 0; - position: absolute; - width: 100%; -} -#docstitle p { - padding:7px 0 0 45px; - margin: 0; - color: white; - text-shadow:0 1px 0 #787878; - background: transparent url(documentation.png) no-repeat scroll 10px 3px; - height: 36px; - font-size: 15px; -} -#header { -height:45px; -left:0; -position:absolute; -right:0; -top:36px; -z-index:900; -} - -#header h1 { -font-size:10pt; -margin:0; -padding:5px 0 0 10px; -text-shadow:0 1px 0 #D5D5D5; -white-space:nowrap; -} - -h1 { --x-system-font:none; -color:#000000; -font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; -font-size:30px; -font-size-adjust:none; -font-stretch:normal; -font-style:normal; -font-variant:normal; -font-weight:bold; -line-height:normal; -margin-bottom:25px; -margin-top:1em; -} - -.footer { -border-top:1px solid #DDDDDD; -clear:both; -padding-top:9px; -width:100%; -font-size:10px; -} - -p { --x-system-font:none; -font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; -font-size:12px; -font-size-adjust:none; -font-stretch:normal; -font-style:normal; -font-variant:normal; -font-weight:normal; -line-height:normal; -margin-bottom:10px; -margin-top:0; -} - -h2 { -border-bottom:1px solid #919699; -color:#000000; -font-size:24px; -margin-top:2.5em; -padding-bottom:2px; -} - -a:link:hover { -color:#093D92; -text-decoration:underline; -} - -a:link { -color:#093D92; -text-decoration:none; -} - - -ol { -list-style-position:outside; -list-style-type:decimal; -margin:0 0 0 30px; -padding:0 0 12px 6px; -} -li { -margin-top:7px; -font-family:'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; -font-size:12px; -font-size-adjust:none; -font-stretch:normal; -font-style:normal; -font-variant:normal; -font-weight:normal; -line-height:normal; -} -li p { -margin-top:8px; -} Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/breadcrumb_background.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/breadcrumb_background.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/documentation.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/documentation.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/header_sm_mid.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/header_sm_mid.png differ diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/static/mobile.css django-guardian-1.2.0/docs/theme/ADCtheme/static/mobile.css --- django-guardian-1.1.1/docs/theme/ADCtheme/static/mobile.css 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/static/mobile.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -/* - * CSS adjustments (overrides) for mobile browsers that cannot handle - * fix-positioned div's very well. - * This makes long pages scrollable on mobile browsers. - */ - -#breadcrumbs { - display: none !important; -} - -.document { - bottom: inherit !important; -} - -#sphinxsidebar { - bottom: inherit !important; -} Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/scrn1.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/scrn1.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/scrn2.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/scrn2.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/searchfield_leftcap.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/searchfield_leftcap.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/searchfield_repeat.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/searchfield_repeat.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/searchfield_rightcap.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/searchfield_rightcap.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/title_background.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/title_background.png differ diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/static/toc.js django-guardian-1.2.0/docs/theme/ADCtheme/static/toc.js --- django-guardian-1.1.1/docs/theme/ADCtheme/static/toc.js 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/static/toc.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -var TOC = { - load: function () { - $('#toc_button').click(TOC.toggle); - }, - - toggle: function () { - if ($('#sphinxsidebar').toggle().is(':hidden')) { - $('div.document').css('left', "0px"); - $('toc_button').removeClass("open"); - } else { - $('div.document').css('left', "230px"); - $('#toc_button').addClass("open"); - } - return $('#sphinxsidebar'); - } -}; - -$(document).ready(function () { - TOC.load(); -}); \ No newline at end of file Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/triangle_closed.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/triangle_closed.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/triangle_left.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/triangle_left.png differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/ADCtheme/static/triangle_open.png and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/ADCtheme/static/triangle_open.png differ diff -Nru django-guardian-1.1.1/docs/theme/ADCtheme/theme.conf django-guardian-1.2.0/docs/theme/ADCtheme/theme.conf --- django-guardian-1.1.1/docs/theme/ADCtheme/theme.conf 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/ADCtheme/theme.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -[theme] -inherit = basic -stylesheet = adctheme.css -pygments_style = friendly - diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/breadcrumbs.html django-guardian-1.2.0/docs/theme/rtd_theme/breadcrumbs.html --- django-guardian-1.1.1/docs/theme/rtd_theme/breadcrumbs.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/breadcrumbs.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,11 @@ + +
    + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/footer.html django-guardian-1.2.0/docs/theme/rtd_theme/footer.html --- django-guardian-1.1.1/docs/theme/rtd_theme/footer.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/footer.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,16 @@ +
    +
    + + {%- if show_copyright %} + {%- if hasdoc('copyright') %} + {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- else %} + {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- endif %} + {%- endif %} + + {%- if last_updated %} + {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %} + {%- endif %} + +
    diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/layout.html django-guardian-1.2.0/docs/theme/rtd_theme/layout.html --- django-guardian-1.1.1/docs/theme/rtd_theme/layout.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/layout.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,137 @@ +{# TEMPLATE VAR SETTINGS #} +{%- set url_root = pathto('', 1) %} +{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} +{%- if not embedded and docstitle %} + {%- set titlesuffix = " — "|safe + docstitle|e %} +{%- else %} + {%- set titlesuffix = "" %} +{%- endif %} + + + + + + + + {% block htmltitle %} + {{ title|striptags|e }}{{ titlesuffix }} + {% endblock %} + + {# FAVICON #} + {% if favicon %} + + {% endif %} + + {# CSS #} + + + {# JS #} + {% if not embedded %} + + + {%- for scriptfile in script_files %} + + {%- endfor %} + + {% if use_opensearch %} + + {% endif %} + + {% endif %} + + {# RTD hosts these file themselves, so just load on non RTD builds #} + {% if not READTHEDOCS %} + + + {% endif %} + + {% for cssfile in css_files %} + + {% endfor %} + + {%- block linktags %} + {%- if hasdoc('about') %} + + {%- endif %} + {%- if hasdoc('genindex') %} + + {%- endif %} + {%- if hasdoc('search') %} + + {%- endif %} + {%- if hasdoc('copyright') %} + + {%- endif %} + + {%- if parents %} + + {%- endif %} + {%- if next %} + + {%- endif %} + {%- if prev %} + + {%- endif %} + {%- endblock %} + {%- block extrahead %} {% endblock %} + + + + + + + +
    + + {# SIDE NAV, TOGGLES ON MOBILE #} + + +
    + + {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #} + + + + {# PAGE CONTENT #} +
    +
    + {% include "breadcrumbs.html" %} + {% block body %}{% endblock %} + {% include "footer.html" %} +
    +
    + +
    + +
    + + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/layout_old.html django-guardian-1.2.0/docs/theme/rtd_theme/layout_old.html --- django-guardian-1.1.1/docs/theme/rtd_theme/layout_old.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/layout_old.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,205 @@ +{# + basic/layout.html + ~~~~~~~~~~~~~~~~~ + + Master layout template for Sphinx themes. + + :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{%- block doctype -%} + +{%- endblock %} +{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %} +{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} +{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and + (sidebars != []) %} +{%- set url_root = pathto('', 1) %} +{# XXX necessary? #} +{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} +{%- if not embedded and docstitle %} + {%- set titlesuffix = " — "|safe + docstitle|e %} +{%- else %} + {%- set titlesuffix = "" %} +{%- endif %} + +{%- macro relbar() %} +
    +

    {{ _('Navigation') }}

    +
      + {%- for rellink in rellinks %} +
    • + {{ rellink[3] }} + {%- if not loop.first %}{{ reldelim2 }}{% endif %}
      • + {%- endfor %} + {%- block rootrellink %} +
    • {{ shorttitle|e }}{{ reldelim1 }}
      • + {%- endblock %} + {%- for parent in parents %} +
    • {{ parent.title }}{{ reldelim1 }}
      • + {%- endfor %} + {%- block relbaritems %} {% endblock %} +
    +
    +{%- endmacro %} + +{%- macro sidebar() %} + {%- if render_sidebar %} +
    +
    + {%- block sidebarlogo %} + {%- if logo %} + + {%- endif %} + {%- endblock %} + {%- if sidebars != None %} + {#- new style sidebar: explicitly include/exclude templates #} + {%- for sidebartemplate in sidebars %} + {%- include sidebartemplate %} + {%- endfor %} + {%- else %} + {#- old style sidebars: using blocks -- should be deprecated #} + {%- block sidebartoc %} + {%- include "localtoc.html" %} + {%- endblock %} + {%- block sidebarrel %} + {%- include "relations.html" %} + {%- endblock %} + {%- block sidebarsourcelink %} + {%- include "sourcelink.html" %} + {%- endblock %} + {%- if customsidebar %} + {%- include customsidebar %} + {%- endif %} + {%- block sidebarsearch %} + {%- include "searchbox.html" %} + {%- endblock %} + {%- endif %} +
    +
    + {%- endif %} +{%- endmacro %} + +{%- macro script() %} + + {%- for scriptfile in script_files %} + + {%- endfor %} +{%- endmacro %} + +{%- macro css() %} + + + {%- for cssfile in css_files %} + + {%- endfor %} +{%- endmacro %} + + + + + {{ metatags }} + {%- block htmltitle %} + {{ title|striptags|e }}{{ titlesuffix }} + {%- endblock %} + {{ css() }} + {%- if not embedded %} + {{ script() }} + {%- if use_opensearch %} + + {%- endif %} + {%- if favicon %} + + {%- endif %} + {%- endif %} +{%- block linktags %} + {%- if hasdoc('about') %} + + {%- endif %} + {%- if hasdoc('genindex') %} + + {%- endif %} + {%- if hasdoc('search') %} + + {%- endif %} + {%- if hasdoc('copyright') %} + + {%- endif %} + + {%- if parents %} + + {%- endif %} + {%- if next %} + + {%- endif %} + {%- if prev %} + + {%- endif %} +{%- endblock %} +{%- block extrahead %} {% endblock %} + + +{%- block header %}{% endblock %} + +{%- block relbar1 %}{{ relbar() }}{% endblock %} + +{%- block content %} + {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %} + +
    + {%- block document %} +
    + {%- if render_sidebar %} +
    + {%- endif %} +
    + {% block body %} {% endblock %} +
    + {%- if render_sidebar %} +
    + {%- endif %} +
    + {%- endblock %} + + {%- block sidebar2 %}{{ sidebar() }}{% endblock %} +
    +
    +{%- endblock %} + +{%- block relbar2 %}{{ relbar() }}{% endblock %} + +{%- block footer %} +
    + {%- if show_copyright %} + {%- if hasdoc('copyright') %} + {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- else %} + {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {%- endif %} + {%- endif %} + {%- if last_updated %} + {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %} + {%- endif %} + {%- if show_sphinx %} + {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %} + {%- endif %} +
    +

    asdf asdf asdf asdf 22

    +{%- endblock %} + + + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/_badge_font_awesome_mini.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/_badge_font_awesome_mini.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/_badge_font_awesome_mini.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/_badge_font_awesome_mini.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,53 @@ +// SIMPLIFIED VERSION OF FONT AWESOME, FOUND HERE http://fortawesome.github.com/Font-Awesome/ + ++font-face(fontawesome-webfont, '#{$font-awesome-dir}fontawesome_webfont') + +.icon:before + display: inline-block + font-family: fontawesome-webfont + font-style: normal + font-weight: normal + line-height: 1 + text-decoration: inherit + +font-smooth + +a .icon + display: inline-block + text-decoration: inherit + + +li + .icon + display: inline-block + .icon-large:before, + .icon-large:before + /* 1.5 increased font size for icon-large * 1.25 width + width: 1.5 * 1.25em + +ul.icons + list-style-type: none + margin-left: 2em + text-indent: -0.8em + li + .icon + width: .8em + .icon-large:before, + .icon-large:before + /* 1.5 increased font size for icon-large * 1.25 width + vertical-align: baseline + // width: 1.5*1.25em + +.icon-book:before + content: "\f02d" + +.icon-caret-down:before + content: "\f0d7" + +.icon-caret-up:before + content: "\f0d8" + +.icon-caret-left:before + content: "\f0d9" + +.icon-caret-right:before + content: "\f0da" diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/badge_only.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/badge_only.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/badge_only.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/badge_only.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,9 @@ +// This file just generates the RTD badge for use on docs not using the RTD theme. + +@import wyrm_core/wy_variables +@import bourbon +@import neat +@import wyrm_core/mixin +@import wyrm_core/grid_settings +@import badge_font_awesome_mini +@import badge diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/_badge.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/_badge.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/_badge.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/_badge.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,84 @@ +.rst-versions + position: fixed + bottom: 0 + left: 0 + width: $nav-desktop-width + color: $section-background-color + background: darken($menu-background-color, 8%) + border-top: solid 10px $menu-background-color + font-family: $base-font-family + a + color: $link_color + text-decoration: none + .rst-badge-small + display: none + .rst-current-version + padding: $base-line-height / 2 + background-color: darken($menu-background-color, 5%) + display: block + text-align: right + font-size: 90% + cursor: pointer + color: $green + z-index: $z-index-tray + +clearfix + .icon + color: $section-background-color + .icon-book + float: left + &.rst-out-of-date + background-color: $red + color: $white + &.shift-up .rst-other-versions + display: block + .rst-other-versions + font-size: 90% + padding: $base-line-height / 2 + color: $text-medium + display: none + hr + display: block + height: 1px + border: 0 + margin: 20px 0 + padding: 0 + border-top: solid 1px lighten($menu-background-color, 5%) + dd + display: inline-block + margin: 0 + a + display: inline-block + padding: $base-line-height / 4 + color: $section-background-color + &.rst-badge + width: auto + bottom: 20px + right: 20px + left: auto + border: none + max-width: $nav-desktop-width + .icon-book + float: none + &.shift-up .rst-current-version + text-align: right + .icon-book + float: left + .rst-current-version + width: auto + height: 30px + line-height: 30px + padding: 0 $base-line-height / 4 + display: block + text-align: center + ++media($tablet) + .rst-versions + width: 85% + display: none + &.shift + display: block + img + width: 100% + height: auto + + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/_breadcrumbs.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/_breadcrumbs.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/_breadcrumbs.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/_breadcrumbs.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,25 @@ +.wy-breadcrumbs li + display: inline-block + &.wy-breadcrumbs-aside + float: right + a + display: inline-block + padding: 5px + &:first-child + padding-left: 0 +.wy-breadcrumbs-extra + margin-bottom: 0 + color: $text-light + font-size: 80% + display: inline-block + + ++media($mobile) + .wy-breadcrumbs-extra + display: none + .wy-breadcrumbs li.wy-breadcrumbs-aside + display: none + +@media print + .wy-breadcrumbs li.wy-breadcrumbs-aside + display: none diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/config.rb django-guardian-1.2.0/docs/theme/rtd_theme/sass/config.rb --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/config.rb 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/config.rb 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,38 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: + +#path = File.dirname(__FILE__) + +http_path = "/" +css_dir = "../static" +sass_dir = "" +images_dir = "../static" +fonts_dir = "../static/font" +javascripts_dir = "../static" +line_comments = false +preferred_syntax = :sass + +# To enable relative paths to assets via compass helper functions. Uncomment: +#relative_assets = true +add_import_path "../../bower_components/bourbon/app/assets/stylesheets" +add_import_path "../../bower_components/neat/app/assets/stylesheets" +add_import_path "../../bower_components/wyrm/sass" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/_nav.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/_nav.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/_nav.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/_nav.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,260 @@ +.wy-affix + position: fixed + top: $gutter + +.wy-menu + a:hover + text-decoration: none + +.wy-menu-horiz + +clearfix + ul, li + display: inline-block + li:hover + background: rgba(255,255,255,.1) + li + &.divide-left + border-left: solid 1px hsl(0, 0%, 25%) + &.divide-right + border-right: solid 1px hsl(0, 0%, 25%) + a + height: $base-font-size * 2 + display: inline-block + line-height: $base-font-size * 2 + padding: 0 $base-font-size + +.wy-menu-vertical + header + height: $base-font-size * 2 + display: inline-block + line-height: $base-font-size * 2 + padding: 0 $gutter + display: block + font-weight: bold + text-transform: uppercase + font-size: 80% + color: $menu-logo-color + white-space: nowrap + + ul + margin-bottom: 0 + li + &.divide-top + border-top: solid 1px hsl(0, 0%, 25%) + &.divide-bottom + border-bottom: solid 1px hsl(0, 0%, 25%) + &.current + background: darken($section-background-color, 10%) + a + color: $text-medium + border-right: solid 1px darken($section-background-color, 20%) + padding: $gutter / 4 $gutter * 1.5 + &:hover + background: darken($section-background-color, 15%) + .current + background: darken($section-background-color, 20%) + li.on a, li.current > a + color: $text-color + padding: $gutter / 4 $gutter + font-weight: bold + position: relative + background: $section-background-color + border: none + border-bottom: solid 1px darken($section-background-color, 20%) + padding-left: $gutter -4px + +font-smooth + &:hover + background: $section-background-color + li.current ul + display: block + li ul + margin-bottom: 0 + display: none + li ul li a + margin-bottom: 0 + color: $text-light + font-weight: normal + a + display: inline-block + line-height: 18px + padding: $gutter / 4 $gutter + display: block + position: relative + font-size: 90% + color: $text-light + &:hover + background-color: lighten($menu-background-color, 10%) + cursor: pointer + &:active + background-color: $menu-logo-color + cursor: pointer + color: $white + +.wy-side-nav-search + z-index: $z-index-popover + background-color: $link-color + text-align: center + padding: $gutter / 2 + display: block + color: $section-background-color + margin-bottom: $gutter / 2 + input[type=text] + width: 100% + border-radius: 50px + padding: 6px 12px + border-color: darken($link-color, 5%) + img + display: block + margin: auto auto $gutter / 2 auto + height: 45px + width: 45px + background-color: $menu-logo-color + padding: 5px + border-radius: 100% + > a, .wy-dropdown > a + color: $section-background-color + font-size: 100% + font-weight: bold + display: inline-block + padding: $base-line-height / 6 $base-line-height / 4 + margin-bottom: $gutter / 2 + +font-smooth + &:hover + background: rgba(255,255,255,.1) + +.wy-nav .wy-menu-vertical + header + color: $link-color + a + color: $text-light + &:hover + background-color: $link-color + color: $white + +[data-menu-wrap] + +transition(all .2s ease-in) + position: absolute + opacity: 1 + width: 100% + opacity: 0 + &.move-center + left: 0 + right: auto + opacity: 1 + &.move-left + right: auto + left: -100% + opacity: 0 + &.move-right + right: -100% + left: auto + opacity: 0 + + +.wy-body-for-nav + background: left repeat-y $section-background-color + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC) + background-size: $nav-desktop-width 1px + +.wy-grid-for-nav + position: absolute + width: 100% + height: 100% + +.wy-nav-side + position: absolute + top: 0 + left: 0 + width: $nav-desktop-width + overflow: hidden + min-height: 100% + background: $menu-background-color + z-index: $z-index-popover + +.wy-nav-top + display: none + background: $link-color + color: $white + padding: $gutter / 4 $gutter / 2 + position: relative + line-height: 50px + text-align: center + font-size: 100% + +clearfix + a + color: $white + font-weight: bold + +font-smooth + img + margin-right: $base-line-height / 2 + height: 45px + width: 45px + background-color: $menu-logo-color + padding: 5px + border-radius: 100% + i + font-size: 30px + float: left + cursor: pointer + +.wy-nav-content-wrap + margin-left: $nav-desktop-width + background: $section-background-color + min-height: 100% + +.wy-nav-content + padding: $gutter $gutter * 2 + height: 100% + max-width: 800px + margin: auto + +.wy-body-mask + position: fixed + width: 100% + height: 100% + background: rgba(0,0,0,.2) + display: none + z-index: $z-index-modal - 1 + &.on + display: block +footer + color: $gray-light + ++media($tablet) + .wy-body-for-nav + background: $section-background-color + .wy-nav-top + display: block + .wy-nav-side + @if $nav-desktop-position == left + left: -$nav-desktop-width + @else + right: -$nav-desktop-width + &.shift + width: 85% + left: 0 + .wy-nav-content-wrap + margin-left: 0 + .wy-nav-content + padding: $gutter + &.shift + position: fixed + min-width: 100% + left: 85% + top: 0 + height: 100% + overflow: hidden + ++media($desktop-wide) + .wy-nav-content-wrap + background: rgba(0,0,0,.05) + .wy-nav-content + margin: 0 + background: $section-background-color + +@media print + .wy-nav-side + display: none + .wy-nav-content-wrap + margin-left: 0 + diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/sass/theme.sass django-guardian-1.2.0/docs/theme/rtd_theme/sass/theme.sass --- django-guardian-1.1.1/docs/theme/rtd_theme/sass/theme.sass 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/sass/theme.sass 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,57 @@ +@import wyrm_core/wy_variables + +// bourbon framework installed from bower +@import bourbon + +// Bourbon neat installed from bower, edit grid settings for media queries +@import wyrm_core/grid_settings +@import neat + +// Custom reset +@import wyrm_core/reset + +// Some compass libs on top of Bourbon +@import compass/typography/vertical_rhythm +@import compass/typography/text/ellipsis + +// Basic defaults and mixins +@import wyrm_core/mixin +@import wyrm_core/font_awesome + +// Wyrm core styles +@import wyrm_core/alert +// @import wyrm_core/autocomplete +@import wyrm_core/button +@import wyrm_core/dropdown +@import wyrm_core/form +@import wyrm_core/generic +@import wyrm_core/grid_layout +@import wyrm_core/spinner +@import wyrm_core/table +@import wyrm_core/type + +// Cms +// @import wyrm_addons/cms/dashboard +// @import wyrm_addons/cms/layout +// @import wyrm_addons/cms/list_like_table +// @import wyrm_addons/cms/plugin_store + +// Elements +// @import wyrm_addons/elements/modal +// @import wyrm_addons/elements/stars +@import wyrm_addons/elements/tooltip + +// Redactor +// @import wyrm_addons/redactor/figures +// @import wyrm_addons/redactor/redactor + +// Restructured text and Sphinx +@import wyrm_addons/rst/rst +@import wyrm_addons/rst/pygments +// @import wyrm_addons/rst/pygments_dark +@import wyrm_addons/rst/pygments_light + +// Theme specific styles +@import breadcrumbs +@import nav +@import badge diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/searchbox.html django-guardian-1.2.0/docs/theme/rtd_theme/searchbox.html --- django-guardian-1.1.1/docs/theme/rtd_theme/searchbox.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/searchbox.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,5 @@ +
    + + + +
    diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/search.html django-guardian-1.2.0/docs/theme/rtd_theme/search.html --- django-guardian-1.1.1/docs/theme/rtd_theme/search.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/search.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,50 @@ +{# + basic/search.html + ~~~~~~~~~~~~~~~~~ + + Template for the search page. + + :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{%- extends "layout.html" %} +{% set title = _('Search') %} +{% set script_files = script_files + ['_static/searchtools.js'] %} +{% block extrahead %} + + {# this is used when loading the search index using $.ajax fails, + such as on Chrome for documents on localhost #} + + {{ super() }} +{% endblock %} +{% block body %} + + + {% if search_performed %} +

    {{ _('Search Results') }}

    + {% if not search_results %} +

    {{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}

    + {% endif %} + {% endif %} +
    + {% if search_results %} +
      + {% for href, caption, context in search_results %} +
    • + {{ caption }} +

      {{ context|e }}

      +
      • + {% endfor %} +
    + {% endif %} +
    +{% endblock %} diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/static/badge_only.css django-guardian-1.2.0/docs/theme/rtd_theme/static/badge_only.css --- django-guardian-1.1.1/docs/theme/rtd_theme/static/badge_only.css 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/static/badge_only.css 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1 @@ +*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.font-smooth,.icon:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:fontawesome-webfont;font-weight:normal;font-style:normal;src:url("font/fontawesome_webfont.eot");src:url("font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("font/fontawesome_webfont.woff") format("woff"),url("font/fontawesome_webfont.ttf") format("truetype"),url("font/fontawesome_webfont.svg#fontawesome-webfont") format("svg")}.icon:before{display:inline-block;font-family:fontawesome-webfont;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .icon{display:inline-block;text-decoration:inherit}li .icon{display:inline-block}li .icon-large:before,li .icon-large:before{width:1.875em}ul.icons{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.icons li .icon{width:0.8em}ul.icons li .icon-large:before,ul.icons li .icon-large:before{vertical-align:baseline}.icon-book:before{content:"\f02d"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;z-index:400;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}} Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/rtd_theme/static/font/fontawesome_webfont.eot and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/rtd_theme/static/font/fontawesome_webfont.eot differ diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/static/font/fontawesome_webfont.svg django-guardian-1.2.0/docs/theme/rtd_theme/static/font/fontawesome_webfont.svg --- django-guardian-1.1.1/docs/theme/rtd_theme/static/font/fontawesome_webfont.svg 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/static/font/fontawesome_webfont.svg 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/rtd_theme/static/font/fontawesome_webfont.ttf and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/rtd_theme/static/font/fontawesome_webfont.ttf differ Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/docs/theme/rtd_theme/static/font/fontawesome_webfont.woff and /tmp/AGly5zYG9L/django-guardian-1.2.0/docs/theme/rtd_theme/static/font/fontawesome_webfont.woff differ diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/static/theme.css django-guardian-1.2.0/docs/theme/rtd_theme/static/theme.css --- django-guardian-1.1.1/docs/theme/rtd_theme/static/theme.css 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/static/theme.css 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1 @@ +*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:20px 0;padding:0}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content dl dt,.rst-content dl dl dt,.rst-content tt.literal,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}.font-smooth,.icon:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-tag-input-group,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:fontawesome-webfont;font-weight:normal;font-style:normal;src:url("font/fontawesome_webfont.eot");src:url("font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("font/fontawesome_webfont.woff") format("woff"),url("font/fontawesome_webfont.ttf") format("truetype"),url("font/fontawesome_webfont.svg#fontawesome-webfont") format("svg")}.icon:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before{display:inline-block;font-family:fontawesome-webfont;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .icon,a .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success a .wy-input-context,a .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger a .wy-input-context,a .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning a .wy-input-context,a .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info a .wy-input-context,a .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag a .wy-tag-remove,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink{display:inline-block;text-decoration:inherit}.icon-large:before{vertical-align:-10%;font-size:1.33333em}.btn .icon,.btn .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .wy-input-context,.btn .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .btn .wy-tag-remove,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.nav .icon,.nav .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .wy-input-context,.nav .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .nav .wy-tag-remove,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink{display:inline}.btn .icon.icon-large,.btn .wy-inline-validate.wy-inline-validate-success .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .icon-large.wy-input-context,.btn .wy-tag-input-group .wy-tag .icon-large.wy-tag-remove,.wy-tag-input-group .wy-tag .btn .icon-large.wy-tag-remove,.btn .rst-content .icon-large.admonition-title,.rst-content .btn .icon-large.admonition-title,.btn .rst-content h1 .icon-large.headerlink,.rst-content h1 .btn .icon-large.headerlink,.btn .rst-content h2 .icon-large.headerlink,.rst-content h2 .btn .icon-large.headerlink,.btn .rst-content h3 .icon-large.headerlink,.rst-content h3 .btn .icon-large.headerlink,.btn .rst-content h4 .icon-large.headerlink,.rst-content h4 .btn .icon-large.headerlink,.btn .rst-content h5 .icon-large.headerlink,.rst-content h5 .btn .icon-large.headerlink,.btn .rst-content h6 .icon-large.headerlink,.rst-content h6 .btn .icon-large.headerlink,.btn .rst-content dl dt .icon-large.headerlink,.rst-content dl dt .btn .icon-large.headerlink,.nav .icon.icon-large,.nav .wy-inline-validate.wy-inline-validate-success .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .icon-large.wy-input-context,.nav .wy-tag-input-group .wy-tag .icon-large.wy-tag-remove,.wy-tag-input-group .wy-tag .nav .icon-large.wy-tag-remove,.nav .rst-content .icon-large.admonition-title,.rst-content .nav .icon-large.admonition-title,.nav .rst-content h1 .icon-large.headerlink,.rst-content h1 .nav .icon-large.headerlink,.nav .rst-content h2 .icon-large.headerlink,.rst-content h2 .nav .icon-large.headerlink,.nav .rst-content h3 .icon-large.headerlink,.rst-content h3 .nav .icon-large.headerlink,.nav .rst-content h4 .icon-large.headerlink,.rst-content h4 .nav .icon-large.headerlink,.nav .rst-content h5 .icon-large.headerlink,.rst-content h5 .nav .icon-large.headerlink,.nav .rst-content h6 .icon-large.headerlink,.rst-content h6 .nav .icon-large.headerlink,.nav .rst-content dl dt .icon-large.headerlink,.rst-content dl dt .nav .icon-large.headerlink{line-height:0.9em}.btn .icon.icon-spin,.btn .wy-inline-validate.wy-inline-validate-success .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .icon-spin.wy-input-context,.btn .wy-tag-input-group .wy-tag .icon-spin.wy-tag-remove,.wy-tag-input-group .wy-tag .btn .icon-spin.wy-tag-remove,.btn .rst-content .icon-spin.admonition-title,.rst-content .btn .icon-spin.admonition-title,.btn .rst-content h1 .icon-spin.headerlink,.rst-content h1 .btn .icon-spin.headerlink,.btn .rst-content h2 .icon-spin.headerlink,.rst-content h2 .btn .icon-spin.headerlink,.btn .rst-content h3 .icon-spin.headerlink,.rst-content h3 .btn .icon-spin.headerlink,.btn .rst-content h4 .icon-spin.headerlink,.rst-content h4 .btn .icon-spin.headerlink,.btn .rst-content h5 .icon-spin.headerlink,.rst-content h5 .btn .icon-spin.headerlink,.btn .rst-content h6 .icon-spin.headerlink,.rst-content h6 .btn .icon-spin.headerlink,.btn .rst-content dl dt .icon-spin.headerlink,.rst-content dl dt .btn .icon-spin.headerlink,.nav .icon.icon-spin,.nav .wy-inline-validate.wy-inline-validate-success .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .icon-spin.wy-input-context,.nav .wy-tag-input-group .wy-tag .icon-spin.wy-tag-remove,.wy-tag-input-group .wy-tag .nav .icon-spin.wy-tag-remove,.nav .rst-content .icon-spin.admonition-title,.rst-content .nav .icon-spin.admonition-title,.nav .rst-content h1 .icon-spin.headerlink,.rst-content h1 .nav .icon-spin.headerlink,.nav .rst-content h2 .icon-spin.headerlink,.rst-content h2 .nav .icon-spin.headerlink,.nav .rst-content h3 .icon-spin.headerlink,.rst-content h3 .nav .icon-spin.headerlink,.nav .rst-content h4 .icon-spin.headerlink,.rst-content h4 .nav .icon-spin.headerlink,.nav .rst-content h5 .icon-spin.headerlink,.rst-content h5 .nav .icon-spin.headerlink,.nav .rst-content h6 .icon-spin.headerlink,.rst-content h6 .nav .icon-spin.headerlink,.nav .rst-content dl dt .icon-spin.headerlink,.rst-content dl dt .nav .icon-spin.headerlink{display:inline-block}.btn.icon:before,.wy-inline-validate.wy-inline-validate-success .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .btn.wy-input-context:before,.wy-tag-input-group .wy-tag .btn.wy-tag-remove:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.icon:hover:before,.wy-inline-validate.wy-inline-validate-success .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-danger .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-warning .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-info .btn.wy-input-context:hover:before,.wy-tag-input-group .wy-tag .btn.wy-tag-remove:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before{opacity:1}.btn-mini .icon:before,.btn-mini .wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .btn-mini .wy-input-context:before,.btn-mini .wy-tag-input-group .wy-tag .wy-tag-remove:before,.wy-tag-input-group .wy-tag .btn-mini .wy-tag-remove:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before{font-size:14px;vertical-align:-15%}li .icon,li .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success li .wy-input-context,li .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger li .wy-input-context,li .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning li .wy-input-context,li .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info li .wy-input-context,li .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag li .wy-tag-remove,li .rst-content .admonition-title,.rst-content li .admonition-title,li .rst-content h1 .headerlink,.rst-content h1 li .headerlink,li .rst-content h2 .headerlink,.rst-content h2 li .headerlink,li .rst-content h3 .headerlink,.rst-content h3 li .headerlink,li .rst-content h4 .headerlink,.rst-content h4 li .headerlink,li .rst-content h5 .headerlink,.rst-content h5 li .headerlink,li .rst-content h6 .headerlink,.rst-content h6 li .headerlink,li .rst-content dl dt .headerlink,.rst-content dl dt li .headerlink{display:inline-block}li .icon-large:before,li .icon-large:before{width:1.875em}ul.icons{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.icons li .icon,ul.icons li .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info ul.icons li .wy-input-context,ul.icons li .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag ul.icons li .wy-tag-remove,ul.icons li .rst-content .admonition-title,.rst-content ul.icons li .admonition-title,ul.icons li .rst-content h1 .headerlink,.rst-content h1 ul.icons li .headerlink,ul.icons li .rst-content h2 .headerlink,.rst-content h2 ul.icons li .headerlink,ul.icons li .rst-content h3 .headerlink,.rst-content h3 ul.icons li .headerlink,ul.icons li .rst-content h4 .headerlink,.rst-content h4 ul.icons li .headerlink,ul.icons li .rst-content h5 .headerlink,.rst-content h5 ul.icons li .headerlink,ul.icons li .rst-content h6 .headerlink,.rst-content h6 ul.icons li .headerlink,ul.icons li .rst-content dl dt .headerlink,.rst-content dl dt ul.icons li .headerlink{width:0.8em}ul.icons li .icon-large:before,ul.icons li .icon-large:before{vertical-align:baseline}.icon-glass:before{content:"\f000"}.icon-music:before{content:"\f001"}.icon-search:before{content:"\f002"}.icon-envelope-alt:before{content:"\f003"}.icon-heart:before{content:"\f004"}.icon-star:before{content:"\f005"}.icon-star-empty:before{content:"\f006"}.icon-user:before{content:"\f007"}.icon-film:before{content:"\f008"}.icon-th-large:before{content:"\f009"}.icon-th:before{content:"\f00a"}.icon-th-list:before{content:"\f00b"}.icon-ok:before{content:"\f00c"}.icon-remove:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before{content:"\f00d"}.icon-zoom-in:before{content:"\f00e"}.icon-zoom-out:before{content:"\f010"}.icon-power-off:before,.icon-off:before{content:"\f011"}.icon-signal:before{content:"\f012"}.icon-gear:before,.icon-cog:before{content:"\f013"}.icon-trash:before{content:"\f014"}.icon-home:before{content:"\f015"}.icon-file-alt:before{content:"\f016"}.icon-time:before{content:"\f017"}.icon-road:before{content:"\f018"}.icon-download-alt:before{content:"\f019"}.icon-download:before{content:"\f01a"}.icon-upload:before{content:"\f01b"}.icon-inbox:before{content:"\f01c"}.icon-play-circle:before{content:"\f01d"}.icon-rotate-right:before,.icon-repeat:before{content:"\f01e"}.icon-refresh:before{content:"\f021"}.icon-list-alt:before{content:"\f022"}.icon-lock:before{content:"\f023"}.icon-flag:before{content:"\f024"}.icon-headphones:before{content:"\f025"}.icon-volume-off:before{content:"\f026"}.icon-volume-down:before{content:"\f027"}.icon-volume-up:before{content:"\f028"}.icon-qrcode:before{content:"\f029"}.icon-barcode:before{content:"\f02a"}.icon-tag:before{content:"\f02b"}.icon-tags:before{content:"\f02c"}.icon-book:before{content:"\f02d"}.icon-bookmark:before{content:"\f02e"}.icon-print:before{content:"\f02f"}.icon-camera:before{content:"\f030"}.icon-font:before{content:"\f031"}.icon-bold:before{content:"\f032"}.icon-italic:before{content:"\f033"}.icon-text-height:before{content:"\f034"}.icon-text-width:before{content:"\f035"}.icon-align-left:before{content:"\f036"}.icon-align-center:before{content:"\f037"}.icon-align-right:before{content:"\f038"}.icon-align-justify:before{content:"\f039"}.icon-list:before{content:"\f03a"}.icon-indent-left:before{content:"\f03b"}.icon-indent-right:before{content:"\f03c"}.icon-facetime-video:before{content:"\f03d"}.icon-picture:before{content:"\f03e"}.icon-pencil:before{content:"\f040"}.icon-map-marker:before{content:"\f041"}.icon-adjust:before{content:"\f042"}.icon-tint:before{content:"\f043"}.icon-edit:before{content:"\f044"}.icon-share:before{content:"\f045"}.icon-check:before{content:"\f046"}.icon-move:before{content:"\f047"}.icon-step-backward:before{content:"\f048"}.icon-fast-backward:before{content:"\f049"}.icon-backward:before{content:"\f04a"}.icon-play:before{content:"\f04b"}.icon-pause:before{content:"\f04c"}.icon-stop:before{content:"\f04d"}.icon-forward:before{content:"\f04e"}.icon-fast-forward:before{content:"\f050"}.icon-step-forward:before{content:"\f051"}.icon-eject:before{content:"\f052"}.icon-chevron-left:before{content:"\f053"}.icon-chevron-right:before{content:"\f054"}.icon-plus-sign:before{content:"\f055"}.icon-minus-sign:before{content:"\f056"}.icon-remove-sign:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:"\f057"}.icon-ok-sign:before{content:"\f058"}.icon-question-sign:before{content:"\f059"}.icon-info-sign:before{content:"\f05a"}.icon-screenshot:before{content:"\f05b"}.icon-remove-circle:before{content:"\f05c"}.icon-ok-circle:before{content:"\f05d"}.icon-ban-circle:before{content:"\f05e"}.icon-arrow-left:before{content:"\f060"}.icon-arrow-right:before{content:"\f061"}.icon-arrow-up:before{content:"\f062"}.icon-arrow-down:before{content:"\f063"}.icon-mail-forward:before,.icon-share-alt:before{content:"\f064"}.icon-resize-full:before{content:"\f065"}.icon-resize-small:before{content:"\f066"}.icon-plus:before{content:"\f067"}.icon-minus:before{content:"\f068"}.icon-asterisk:before{content:"\f069"}.icon-exclamation-sign:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:"\f06a"}.icon-gift:before{content:"\f06b"}.icon-leaf:before{content:"\f06c"}.icon-fire:before{content:"\f06d"}.icon-eye-open:before{content:"\f06e"}.icon-eye-close:before{content:"\f070"}.icon-warning-sign:before{content:"\f071"}.icon-plane:before{content:"\f072"}.icon-calendar:before{content:"\f073"}.icon-random:before{content:"\f074"}.icon-comment:before{content:"\f075"}.icon-magnet:before{content:"\f076"}.icon-chevron-up:before{content:"\f077"}.icon-chevron-down:before{content:"\f078"}.icon-retweet:before{content:"\f079"}.icon-shopping-cart:before{content:"\f07a"}.icon-folder-close:before{content:"\f07b"}.icon-folder-open:before{content:"\f07c"}.icon-resize-vertical:before{content:"\f07d"}.icon-resize-horizontal:before{content:"\f07e"}.icon-bar-chart:before{content:"\f080"}.icon-twitter-sign:before{content:"\f081"}.icon-facebook-sign:before{content:"\f082"}.icon-camera-retro:before{content:"\f083"}.icon-key:before{content:"\f084"}.icon-gears:before,.icon-cogs:before{content:"\f085"}.icon-comments:before{content:"\f086"}.icon-thumbs-up-alt:before{content:"\f087"}.icon-thumbs-down-alt:before{content:"\f088"}.icon-star-half:before{content:"\f089"}.icon-heart-empty:before{content:"\f08a"}.icon-signout:before{content:"\f08b"}.icon-linkedin-sign:before{content:"\f08c"}.icon-pushpin:before{content:"\f08d"}.icon-external-link:before{content:"\f08e"}.icon-signin:before{content:"\f090"}.icon-trophy:before{content:"\f091"}.icon-github-sign:before{content:"\f092"}.icon-upload-alt:before{content:"\f093"}.icon-lemon:before{content:"\f094"}.icon-phone:before{content:"\f095"}.icon-unchecked:before,.icon-check-empty:before{content:"\f096"}.icon-bookmark-empty:before{content:"\f097"}.icon-phone-sign:before{content:"\f098"}.icon-twitter:before{content:"\f099"}.icon-facebook:before{content:"\f09a"}.icon-github:before{content:"\f09b"}.icon-unlock:before{content:"\f09c"}.icon-credit-card:before{content:"\f09d"}.icon-rss:before{content:"\f09e"}.icon-hdd:before{content:"\f0a0"}.icon-bullhorn:before{content:"\f0a1"}.icon-bell:before{content:"\f0a2"}.icon-certificate:before{content:"\f0a3"}.icon-hand-right:before{content:"\f0a4"}.icon-hand-left:before{content:"\f0a5"}.icon-hand-up:before{content:"\f0a6"}.icon-hand-down:before{content:"\f0a7"}.icon-circle-arrow-left:before{content:"\f0a8"}.icon-circle-arrow-right:before{content:"\f0a9"}.icon-circle-arrow-up:before{content:"\f0aa"}.icon-circle-arrow-down:before{content:"\f0ab"}.icon-globe:before{content:"\f0ac"}.icon-wrench:before{content:"\f0ad"}.icon-tasks:before{content:"\f0ae"}.icon-filter:before{content:"\f0b0"}.icon-briefcase:before{content:"\f0b1"}.icon-fullscreen:before{content:"\f0b2"}.icon-group:before{content:"\f0c0"}.icon-link:before{content:"\f0c1"}.icon-cloud:before{content:"\f0c2"}.icon-beaker:before{content:"\f0c3"}.icon-cut:before{content:"\f0c4"}.icon-copy:before{content:"\f0c5"}.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6"}.icon-save:before{content:"\f0c7"}.icon-sign-blank:before{content:"\f0c8"}.icon-reorder:before{content:"\f0c9"}.icon-list-ul:before{content:"\f0ca"}.icon-list-ol:before{content:"\f0cb"}.icon-strikethrough:before{content:"\f0cc"}.icon-underline:before{content:"\f0cd"}.icon-table:before{content:"\f0ce"}.icon-magic:before{content:"\f0d0"}.icon-truck:before{content:"\f0d1"}.icon-pinterest:before{content:"\f0d2"}.icon-pinterest-sign:before{content:"\f0d3"}.icon-google-plus-sign:before{content:"\f0d4"}.icon-google-plus:before{content:"\f0d5"}.icon-money:before{content:"\f0d6"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-columns:before{content:"\f0db"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-envelope:before{content:"\f0e0"}.icon-linkedin:before{content:"\f0e1"}.icon-rotate-left:before,.icon-undo:before{content:"\f0e2"}.icon-legal:before{content:"\f0e3"}.icon-dashboard:before{content:"\f0e4"}.icon-comment-alt:before{content:"\f0e5"}.icon-comments-alt:before{content:"\f0e6"}.icon-bolt:before{content:"\f0e7"}.icon-sitemap:before{content:"\f0e8"}.icon-umbrella:before{content:"\f0e9"}.icon-paste:before{content:"\f0ea"}.icon-lightbulb:before{content:"\f0eb"}.icon-exchange:before{content:"\f0ec"}.icon-cloud-download:before{content:"\f0ed"}.icon-cloud-upload:before{content:"\f0ee"}.icon-user-md:before{content:"\f0f0"}.icon-stethoscope:before{content:"\f0f1"}.icon-suitcase:before{content:"\f0f2"}.icon-bell-alt:before{content:"\f0f3"}.icon-coffee:before{content:"\f0f4"}.icon-food:before{content:"\f0f5"}.icon-file-text-alt:before{content:"\f0f6"}.icon-building:before{content:"\f0f7"}.icon-hospital:before{content:"\f0f8"}.icon-ambulance:before{content:"\f0f9"}.icon-medkit:before{content:"\f0fa"}.icon-fighter-jet:before{content:"\f0fb"}.icon-beer:before{content:"\f0fc"}.icon-h-sign:before{content:"\f0fd"}.icon-plus-sign-alt:before{content:"\f0fe"}.icon-double-angle-left:before{content:"\f100"}.icon-double-angle-right:before{content:"\f101"}.icon-double-angle-up:before{content:"\f102"}.icon-double-angle-down:before{content:"\f103"}.icon-angle-left:before{content:"\f104"}.icon-angle-right:before{content:"\f105"}.icon-angle-up:before{content:"\f106"}.icon-angle-down:before{content:"\f107"}.icon-desktop:before{content:"\f108"}.icon-laptop:before{content:"\f109"}.icon-tablet:before{content:"\f10a"}.icon-mobile-phone:before{content:"\f10b"}.icon-circle-blank:before{content:"\f10c"}.icon-quote-left:before{content:"\f10d"}.icon-quote-right:before{content:"\f10e"}.icon-spinner:before{content:"\f110"}.icon-circle:before{content:"\f111"}.icon-mail-reply:before,.icon-reply:before{content:"\f112"}.icon-github-alt:before{content:"\f113"}.icon-folder-close-alt:before{content:"\f114"}.icon-folder-open-alt:before{content:"\f115"}.icon-expand-alt:before{content:"\f116"}.icon-collapse-alt:before{content:"\f117"}.icon-smile:before{content:"\f118"}.icon-frown:before{content:"\f119"}.icon-meh:before{content:"\f11a"}.icon-gamepad:before{content:"\f11b"}.icon-keyboard:before{content:"\f11c"}.icon-flag-alt:before{content:"\f11d"}.icon-flag-checkered:before{content:"\f11e"}.icon-terminal:before{content:"\f120"}.icon-code:before{content:"\f121"}.icon-reply-all:before{content:"\f122"}.icon-mail-reply-all:before{content:"\f122"}.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123"}.icon-location-arrow:before{content:"\f124"}.icon-crop:before{content:"\f125"}.icon-code-fork:before{content:"\f126"}.icon-unlink:before{content:"\f127"}.icon-question:before{content:"\f128"}.icon-info:before{content:"\f129"}.icon-exclamation:before{content:"\f12a"}.icon-superscript:before{content:"\f12b"}.icon-subscript:before{content:"\f12c"}.icon-eraser:before{content:"\f12d"}.icon-puzzle-piece:before{content:"\f12e"}.icon-microphone:before{content:"\f130"}.icon-microphone-off:before{content:"\f131"}.icon-shield:before{content:"\f132"}.icon-calendar-empty:before{content:"\f133"}.icon-fire-extinguisher:before{content:"\f134"}.icon-rocket:before{content:"\f135"}.icon-maxcdn:before{content:"\f136"}.icon-chevron-sign-left:before{content:"\f137"}.icon-chevron-sign-right:before{content:"\f138"}.icon-chevron-sign-up:before{content:"\f139"}.icon-chevron-sign-down:before{content:"\f13a"}.icon-html5:before{content:"\f13b"}.icon-css3:before{content:"\f13c"}.icon-anchor:before{content:"\f13d"}.icon-unlock-alt:before{content:"\f13e"}.icon-bullseye:before{content:"\f140"}.icon-ellipsis-horizontal:before{content:"\f141"}.icon-ellipsis-vertical:before{content:"\f142"}.icon-rss-sign:before{content:"\f143"}.icon-play-sign:before{content:"\f144"}.icon-ticket:before{content:"\f145"}.icon-minus-sign-alt:before{content:"\f146"}.icon-check-minus:before{content:"\f147"}.icon-level-up:before{content:"\f148"}.icon-level-down:before{content:"\f149"}.icon-check-sign:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:"\f14a"}.icon-edit-sign:before{content:"\f14b"}.icon-external-link-sign:before{content:"\f14c"}.icon-share-sign:before{content:"\f14d"}.icon-compass:before{content:"\f14e"}.icon-collapse:before{content:"\f150"}.icon-collapse-top:before{content:"\f151"}.icon-expand:before{content:"\f152"}.icon-euro:before,.icon-eur:before{content:"\f153"}.icon-gbp:before{content:"\f154"}.icon-dollar:before,.icon-usd:before{content:"\f155"}.icon-rupee:before,.icon-inr:before{content:"\f156"}.icon-yen:before,.icon-jpy:before{content:"\f157"}.icon-renminbi:before,.icon-cny:before{content:"\f158"}.icon-won:before,.icon-krw:before{content:"\f159"}.icon-bitcoin:before,.icon-btc:before{content:"\f15a"}.icon-file:before{content:"\f15b"}.icon-file-text:before{content:"\f15c"}.icon-sort-by-alphabet:before{content:"\f15d"}.icon-sort-by-alphabet-alt:before{content:"\f15e"}.icon-sort-by-attributes:before{content:"\f160"}.icon-sort-by-attributes-alt:before{content:"\f161"}.icon-sort-by-order:before{content:"\f162"}.icon-sort-by-order-alt:before{content:"\f163"}.icon-thumbs-up:before{content:"\f164"}.icon-thumbs-down:before{content:"\f165"}.icon-youtube-sign:before{content:"\f166"}.icon-youtube:before{content:"\f167"}.icon-xing:before{content:"\f168"}.icon-xing-sign:before{content:"\f169"}.icon-youtube-play:before{content:"\f16a"}.icon-dropbox:before{content:"\f16b"}.icon-stackexchange:before{content:"\f16c"}.icon-instagram:before{content:"\f16d"}.icon-flickr:before{content:"\f16e"}.icon-adn:before{content:"\f170"}.icon-bitbucket:before{content:"\f171"}.icon-bitbucket-sign:before{content:"\f172"}.icon-tumblr:before{content:"\f173"}.icon-tumblr-sign:before{content:"\f174"}.icon-long-arrow-down:before{content:"\f175"}.icon-long-arrow-up:before{content:"\f176"}.icon-long-arrow-left:before{content:"\f177"}.icon-long-arrow-right:before{content:"\f178"}.icon-apple:before{content:"\f179"}.icon-windows:before{content:"\f17a"}.icon-android:before{content:"\f17b"}.icon-linux:before{content:"\f17c"}.icon-dribbble:before{content:"\f17d"}.icon-skype:before{content:"\f17e"}.icon-foursquare:before{content:"\f180"}.icon-trello:before{content:"\f181"}.icon-female:before{content:"\f182"}.icon-male:before{content:"\f183"}.icon-gittip:before{content:"\f184"}.icon-sun:before{content:"\f185"}.icon-moon:before{content:"\f186"}.icon-archive:before{content:"\f187"}.icon-bug:before{content:"\f188"}.icon-vk:before{content:"\f189"}.icon-weibo:before{content:"\f18a"}.icon-renren:before{content:"\f18b"}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning{padding:24px;line-height:24px;margin-bottom:24px;border-left:solid 3px transparent}.wy-alert strong,.rst-content .note strong,.rst-content .attention strong,.rst-content .caution strong,.rst-content .danger strong,.rst-content .error strong,.rst-content .hint strong,.rst-content .important strong,.rst-content .tip strong,.rst-content .warning strong,.wy-alert a,.rst-content .note a,.rst-content .attention a,.rst-content .caution a,.rst-content .danger a,.rst-content .error a,.rst-content .hint a,.rst-content .important a,.rst-content .tip a,.rst-content .warning a{color:#fff}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning{background:#e74c3c;color:#fdf3f2;border-color:#d62c1a}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning{background:#e67e22;color:#fbe9d9;border-color:#bf6516}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-info.warning{background:#2980b9;color:#bedcf0;border-color:#20638f}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .wy-alert-success.hint,.rst-content .wy-alert-success.important,.rst-content .wy-alert-success.tip,.rst-content .wy-alert-success.warning{background:#27ae60;color:#b3eecc;border-color:#1e8449}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning{background:#f3f6f6;border-color:#e1e4e5}.wy-alert.wy-alert-neutral strong,.rst-content .wy-alert-neutral.note strong,.rst-content .wy-alert-neutral.attention strong,.rst-content .wy-alert-neutral.caution strong,.rst-content .wy-alert-neutral.danger strong,.rst-content .wy-alert-neutral.error strong,.rst-content .wy-alert-neutral.hint strong,.rst-content .wy-alert-neutral.important strong,.rst-content .wy-alert-neutral.tip strong,.rst-content .wy-alert-neutral.warning strong{color:#404040}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a{color:#2980b9}.wy-tray-container{position:fixed;top:-50px;left:0;width:100%;-webkit-transition:top 0.2s ease-in;-moz-transition:top 0.2s ease-in;transition:top 0.2s ease-in}.wy-tray-container.on{top:0}.wy-tray-container li{display:none;width:100%;background:#343131;padding:12px 24px;color:#fff;margin-bottom:6px;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1),0px -1px 2px -1px rgba(255,255,255,0.5) inset}.wy-tray-container li.wy-tray-item-success{background:#27ae60}.wy-tray-container li.wy-tray-item-info{background:#2980b9}.wy-tray-container li.wy-tray-item-warning{background:#e67e22}.wy-tray-container li.wy-tray-item-danger{background:#e74c3c}.btn{display:inline-block;*display:inline;zoom:1;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:100%;padding:6px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);border-bottom:solid 3px rgba(0,0,0,0.1);background-color:#27ae60;text-decoration:none;font-weight:500;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear;outline-none:false}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;color:#fff;outline:0}.btn:active{border-top:solid 3px rgba(0,0,0,0.1);border-bottom:solid 1px rgba(0,0,0,0.1);box-shadow:0px 1px 2px -1px rgba(0,0,0,0.5) inset}.btn[disabled]{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980b9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-danger{background-color:#e74c3c !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#e67e22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#343131}.btn-invert:hover{background-color:#413d3d !important}.btn-link{background-color:transparent !important;color:#2980b9;border-color:transparent}.btn-link:hover{background-color:transparent !important;color:#409ad5;border-color:transparent}.btn-link:active{background-color:transparent !important;border-color:transparent;border-top:solid 1px transparent;border-bottom:solid 3px transparent}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown:hover .wy-dropdown-menu{display:block}.wy-dropdown .caret:after{font-family:fontawesome-webfont;content:"\f0d7";font-size:70%}.wy-dropdown-menu{position:absolute;top:100%;left:0;display:none;float:left;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px}.wy-dropdown-menu>dd>a:hover{background:#2980b9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980b9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:0.5em 1em 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:0.5em}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#999;font-size:90%}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button{-webkit-appearance:button;cursor:pointer;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#2980b9}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129fea}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#f3f6f6;color:#cad2d3}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#e74c3c;border:1px solid #e74c3c}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#e9322d}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:0.8em;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fff;color:#cad2d3;border-color:transparent}.wy-checkbox,.wy-radio{margin:0.5em 0;color:#404040 !important;display:block}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{padding:6px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27ae60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#e74c3c}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#e67e22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980b9}.wy-control-group{margin-bottom:24px;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error label{color:#e74c3c}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 2px #e74c3c}.wy-control-group.wy-control-group-error textarea{border:solid 2px #e74c3c}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#ccc;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-tag-input-group{padding:4px 4px 0px 4px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}.wy-tag-input-group .wy-tag{display:inline-block;background-color:rgba(0,0,0,0.1);padding:0.5em 0.625em;border-radius:2px;position:relative;margin-bottom:4px}.wy-tag-input-group .wy-tag .wy-tag-remove{color:#ccc;margin-left:5px}.wy-tag-input-group .wy-tag .wy-tag-remove:hover{color:#e74c3c}.wy-tag-input-group label{margin-left:5px;display:inline-block;margin-bottom:0}.wy-tag-input-group input{border:none;font-size:100%;margin-bottom:4px;box-shadow:none}.wy-form-upload{border:solid 1px #ccc;border-bottom:solid 3px #ccc;background-color:#fff;padding:24px;display:inline-block;text-align:center;cursor:pointer;color:#404040;-webkit-transition:border-color 0.1s ease-in;-moz-transition:border-color 0.1s ease-in;transition:border-color 0.1s ease-in;*zoom:1}.wy-form-upload:before,.wy-form-upload:after{display:table;content:""}.wy-form-upload:after{clear:both}@media screen and (max-width: 480px){.wy-form-upload{width:100%}}.wy-form-upload .image-drop{display:none}.wy-form-upload .image-desktop{display:none}.wy-form-upload .image-loading{display:none}.wy-form-upload .wy-form-upload-icon{display:block;font-size:32px;color:#b3b3b3}.wy-form-upload .image-drop .wy-form-upload-icon{color:#27ae60}.wy-form-upload p{font-size:90%}.wy-form-upload .wy-form-upload-image{float:left;margin-right:24px}@media screen and (max-width: 480px){.wy-form-upload .wy-form-upload-image{width:100%;margin-bottom:24px}}.wy-form-upload img{max-width:125px;max-height:125px;opacity:0.9;-webkit-transition:opacity 0.1s ease-in;-moz-transition:opacity 0.1s ease-in;transition:opacity 0.1s ease-in}.wy-form-upload .wy-form-upload-content{float:left}@media screen and (max-width: 480px){.wy-form-upload .wy-form-upload-content{width:100%}}.wy-form-upload:hover{border-color:#b3b3b3;color:#404040}.wy-form-upload:hover .image-desktop{display:block}.wy-form-upload:hover .image-drag{display:none}.wy-form-upload:hover img{opacity:1}.wy-form-upload:active{border-top:solid 3px #ccc;border-bottom:solid 1px #ccc}.wy-form-upload.wy-form-upload-big{width:100%;text-align:center;padding:72px}.wy-form-upload.wy-form-upload-big .wy-form-upload-content{float:none}.wy-form-upload.wy-form-upload-file p{margin-bottom:0}.wy-form-upload.wy-form-upload-file .wy-form-upload-icon{display:inline-block;font-size:inherit}.wy-form-upload.wy-form-upload-drop{background-color:#ddf7e8}.wy-form-upload.wy-form-upload-drop .image-drop{display:block}.wy-form-upload.wy-form-upload-drop .image-desktop{display:none}.wy-form-upload.wy-form-upload-drop .image-drag{display:none}.wy-form-upload.wy-form-upload-loading .image-drag{display:none}.wy-form-upload.wy-form-upload-loading .image-desktop{display:none}.wy-form-upload.wy-form-upload-loading .image-loading{display:block}.wy-form-upload.wy-form-upload-loading .wy-input-prefix{display:none}.wy-form-upload.wy-form-upload-loading p{margin-bottom:0}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}.wy-form-gallery-manage{margin-left:-12px;margin-right:-12px}.wy-form-gallery-manage li{float:left;padding:12px;width:20%;cursor:pointer}@media screen and (max-width: 768px){.wy-form-gallery-manage li{width:25%}}@media screen and (max-width: 480px){.wy-form-gallery-manage li{width:50%}}.wy-form-gallery-manage li:active{cursor:move}.wy-form-gallery-manage li>a{padding:12px;background-color:#fff;border:solid 1px #e1e4e5;border-bottom:solid 3px #e1e4e5;display:inline-block;-webkit-transition:all 0.1s ease-in;-moz-transition:all 0.1s ease-in;transition:all 0.1s ease-in}.wy-form-gallery-manage li>a:active{border:solid 1px #ccc;border-top:solid 3px #ccc}.wy-form-gallery-manage img{width:100%;-webkit-transition:all 0.05s ease-in;-moz-transition:all 0.05s ease-in;transition:all 0.05s ease-in}li.wy-form-gallery-edit{position:relative;color:#fff;padding:24px;width:100%;display:block;background-color:#343131;border-radius:4px}li.wy-form-gallery-edit .arrow{position:absolute;display:block;top:-50px;left:50%;margin-left:-25px;z-index:500;height:0;width:0;border-color:transparent;border-style:solid;border-width:25px;border-bottom-color:#343131}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-controls{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:0.2em 0 0.8em}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-grid-one-col{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;max-width:1066px;margin-top:1.618em}.wy-grid-one-col:before,.wy-grid-one-col:after{display:table;content:""}.wy-grid-one-col:after{clear:both}.wy-grid-one-col section{display:block;float:left;margin-right:2.35765%;width:100%;background:#fcfcfc;padding:1.618em;margin-right:0}.wy-grid-one-col section:last-child{margin-right:0}.wy-grid-index-card{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;max-width:460px;margin-top:1.618em;background:#fcfcfc;padding:1.618em}.wy-grid-index-card:before,.wy-grid-index-card:after{display:table;content:""}.wy-grid-index-card:after{clear:both}.wy-grid-index-card header,.wy-grid-index-card section,.wy-grid-index-card aside{display:block;float:left;margin-right:2.35765%;width:100%}.wy-grid-index-card header:last-child,.wy-grid-index-card section:last-child,.wy-grid-index-card aside:last-child{margin-right:0}.wy-grid-index-card.twocol{max-width:768px}.wy-grid-index-card.twocol section{display:block;float:left;margin-right:2.35765%;width:48.82117%}.wy-grid-index-card.twocol section:last-child{margin-right:0}.wy-grid-index-card.twocol aside{display:block;float:left;margin-right:2.35765%;width:48.82117%}.wy-grid-index-card.twocol aside:last-child{margin-right:0}.wy-grid-search-filter{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;margin-bottom:24px}.wy-grid-search-filter:before,.wy-grid-search-filter:after{display:table;content:""}.wy-grid-search-filter:after{clear:both}.wy-grid-search-filter .wy-grid-search-filter-input{display:block;float:left;margin-right:2.35765%;width:74.41059%}.wy-grid-search-filter .wy-grid-search-filter-input:last-child{margin-right:0}.wy-grid-search-filter .wy-grid-search-filter-btn{display:block;float:left;margin-right:2.35765%;width:23.23176%}.wy-grid-search-filter .wy-grid-search-filter-btn:last-child{margin-right:0}.wy-spinner{height:30px;width:30px;margin:0 auto;position:relative;-webkit-animation:rotation 0.6s infinite linear;-moz-animation:rotation 0.6s infinite linear;animation:rotation 0.6s infinite linear;border:8px solid #e7f2fa;border-top:8px solid #2980b9;border-radius:100%}.wy-spinner.wy-spinner-margin{margin:24px auto}.btn .wy-spinner{display:inline-block;height:14px;width:14px;border-width:4px;border-color:rgba(0,0,0,0.1);border-top-color:#fff;top:1px}.wy-logo .wy-spinner{border-color:rgba(0,0,0,0.1);border-top-color:#fcfcfc;margin-bottom:0.809em}.wy-spinner.wy-spinner-inline{display:inline-block;margin:none}.wy-spinner.wy-spinner-large{height:45px;width:45px;border-width:12px}.wy-spinner.wy-spinner-small{height:16px;width:16px;border-width:4px}@-webkit-keyframes rotation{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(359deg)}}@-moz-keyframes rotation{from{-moz-transform:rotate(0deg)}to{-moz-transform:rotate(359deg)}}@-o-keyframes rotation{from{-o-transform:rotate(0deg)}to{-o-transform:rotate(359deg)}}@keyframes rotation{from{transform:rotate(0deg)}to{transform:rotate(359deg)}}.wy-table,.rst-content table.docutils,.rst-content table.docutils.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.docutils.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.docutils.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.docutils.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.docutils.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.docutils.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.docutils.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.docutils.field-list td p{line-height:18px;margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}a{color:#2980b9;text-decoration:none}a:hover{color:#3091d1}.link-danger{color:#e74c3c}.link-danger:hover{color:#d62c1a}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}h1,h2,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}small{font-size:80%}code,.rst-content dl dt,.rst-content dl dl dt,.rst-content tt.literal{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:80%;padding:0 5px;font-family:"Incosolata","Consolata","Monaco",monospace;color:#e74c3c;overflow-x:auto}code.code-large,.rst-content dl dt.code-large,.rst-content tt.code-large.literal{font-size:90%}.full-width{width:100%}.wy-plain-list-disc,.rst-content .section ul,.rst-content ul.simple,.rst-content ul.stimple ul,.rst-content .toctree-wrapper ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content ul.simple li,.rst-content ul.stimple ul li,.rst-content .toctree-wrapper ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content ul.simple li ul,.rst-content ul.stimple ul li ul,.rst-content .toctree-wrapper ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content ul.simple li li,.rst-content ul.stimple ul li li,.rst-content .toctree-wrapper ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content ul.simple li li li,.rst-content ul.stimple ul li li li,.rst-content .toctree-wrapper ul li li li{list-style:square}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.simple,.rst-content ol.arabic{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.simple li,.rst-content ol.arabic li{list-style:decimal;margin-left:24px}.wy-type-large{font-size:120%}.wy-type-normal{font-size:100%}.wy-type-small{font-size:100%}.wy-type-strike{text-decoration:line-through}.wy-text-warning{color:#e67e22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980b9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27ae60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#e74c3c !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}.wy-tooltip{position:absolute;z-index:300;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;-webkit-transition:opacity 2s ease-in;-moz-transition:opacity 2s ease-in;transition:opacity 2s ease-in}.wy-tooltip.on{opacity:0.8}.wy-tooltip.top{margin-top:-2px}.wy-tooltip.right{margin-left:2px}.wy-tooltip.bottom{margin-top:2px}.wy-tooltip.left{margin-left:-2px}.wy-tooltip.top .wy-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000}.wy-tooltip.left .wy-tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.wy-tooltip.bottom .wy-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000}.wy-tooltip.right .wy-tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000}.wy-tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.wy-tooltip-arrow{position:absolute;width:0;height:0}.rst-content img{max-width:800px;height:auto !important}.rst-content .section>img{margin-bottom:24px}.rst-content .note p.last,.rst-content .note p.first,.rst-content .attention p.last,.rst-content .attention p.first,.rst-content .caution p.last,.rst-content .caution p.first,.rst-content .danger p.last,.rst-content .danger p.first,.rst-content .error p.last,.rst-content .error p.first,.rst-content .hint p.last,.rst-content .hint p.first,.rst-content .important p.last,.rst-content .important p.first,.rst-content .tip p.last,.rst-content .tip p.first,.rst-content .warning p.last,.rst-content .warning p.first{margin-bottom:0}.rst-content .admonition-title{font-weight:bold}.rst-content .admonition-title:before{margin-right:4px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after{visibility:visible;content:"\f0c1";font-family:fontawesome-webfont;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink{display:inline-block}.rst-content table.docutils.field-list{border:none}.rst-content table.docutils.field-list td{border:none}.rst-content table.docutils.field-list .field-name{padding-right:5px;text-align:left}.rst-content table.docutils.field-list .field-body{text-align:left;padding-left:0}.rst-content dl dt{display:inline-block;margin-bottom:6px;font-size:80%;line-height:normal;background:#ccc;color:#333;border:none;border-left:solid 3px #999;padding:6px}.rst-content dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl dt .descname,.rst-content dl dt .descclassname,.rst-content dl dt big,.rst-content dl dt em{font-size:100% !important;line-height:normal}.rst-content dl dd{margin-left:24px}.rst-content dl dl dt{display:inline-block;margin-bottom:6px;font-size:80%;line-height:normal}.rst-content dl dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content tt{font-family:"Incosolata","Consolata","Monaco",monospace}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content #search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}.rst-content #search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}.rst-content #search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}.rst-content #search-results .context{color:gray;font-size:90%}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9b59b6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;width:100%;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Menlo,"Bitstream Vera Sans Mono","DejaVu Sans Mono",Monaco,Consolas,"source-code-pro-1","source-code-pro-2",monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Menlo,"Bitstream Vera Sans Mono","DejaVu Sans Mono",Monaco,Consolas,"source-code-pro-1","source-code-pro-2",monospace;font-size:12px;line-height:1.5;display:block;overflow:auto}pre.literal-block{@extends .codeblock;;background:#343131;color:#fff;padding:42px 12px 12px 12px;font-family:Menlo,"Bitstream Vera Sans Mono","DejaVu Sans Mono",Monaco,Consolas,"source-code-pro-1","source-code-pro-2",monospace;font-size:12px;line-height:1.5;position:relative}pre.literal-block:after{position:absolute;content:" Terminal";background:#f3f6f6;color:#404040;top:0;left:0;width:100%;padding:6px 0}@media print{.codeblock,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#f8f8f8;border:1px solid #ccc;padding:1.5px 5px}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#eaf2f5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical header{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#2980b9;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li.current a .current{background:#c9c9c9}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:active{background-color:#2980b9;cursor:pointer;color:#fff}.wy-side-nav-search{z-index:200;background-color:#2980b9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-nav .wy-menu-vertical header{color:#2980b9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980b9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:absolute;top:0;left:0;width:300px;overflow:hidden;min-height:100%;background:#343131;z-index:200}.wy-nav-top{display:none;background:#2980b9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;z-index:400;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .icon,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .rst-versions .rst-current-version .wy-tag-remove,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink{color:#fcfcfc}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}} diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/static/theme.js django-guardian-1.2.0/docs/theme/rtd_theme/static/theme.js --- django-guardian-1.1.1/docs/theme/rtd_theme/static/theme.js 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/static/theme.js 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,16 @@ +$( document ).ready(function() { + // Shift nav in mobile when clicking the menu. + $("[data-toggle='wy-nav-top']").click(function() { + $("[data-toggle='wy-nav-shift']").toggleClass("shift"); + $("[data-toggle='rst-versions']").toggleClass("shift"); + }); + // Close menu when you click a link. + $(".wy-menu-vertical .current ul li a").click(function() { + $("[data-toggle='wy-nav-shift']").removeClass("shift"); + $("[data-toggle='rst-versions']").toggleClass("shift"); + }); + $("[data-toggle='rst-current-version']").click(function() { + $("[data-toggle='rst-versions']").toggleClass("shift-up"); + }); + $("table.docutils:not(.field-list").wrap("
    "); +}); diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/theme.conf django-guardian-1.2.0/docs/theme/rtd_theme/theme.conf --- django-guardian-1.1.1/docs/theme/rtd_theme/theme.conf 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/theme.conf 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,7 @@ +[theme] +inherit = basic +stylesheet = theme.css + +[options] +typekit_id = hiw1hhg +analytics_id = diff -Nru django-guardian-1.1.1/docs/theme/rtd_theme/versions.html django-guardian-1.2.0/docs/theme/rtd_theme/versions.html --- django-guardian-1.1.1/docs/theme/rtd_theme/versions.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/theme/rtd_theme/versions.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,38 @@ +{% if READTHEDOCS %} +{# Add rst-badge after rst-versions for small badge style. #} +
    + + Read the Docs + v: {{ current_version }} + {% if current_version != "latest" %}(old) {% endif %} + + +
    +
    +
    Versions
    + {% for slug, url in versions %} +
    {{ slug }}
    + {% endfor %} +
    +
    +
    Downloads
    + {% for type, url in downloads %} +
    {{ type }}
    + {% endfor %} +
    +
    +
    On Read the Docs
    +
    + Project Home +
    +
    + Builds +
    +
    +
    + Free document hosting provided by Read the Docs. + +
    +
    +{% endif %} + diff -Nru django-guardian-1.1.1/docs/userguide/assign.rst django-guardian-1.2.0/docs/userguide/assign.rst --- django-guardian-1.1.1/docs/userguide/assign.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/userguide/assign.rst 2014-07-22 09:46:49.000000000 +0000 @@ -69,6 +69,7 @@ .. code-block:: python + >>> from django.contrib.auth.models import User >>> boss = User.objects.create(username='Big Boss') >>> joe = User.objects.create(username='joe') >>> task = Task.objects.create(summary='Some job', content='', reported_by=boss) @@ -93,6 +94,7 @@ .. code-block:: python + >>> from django.contrib.auth.models import Group >>> group = Group.objects.create(name='employees') >>> assign_perm('change_task', group, task) >>> joe.has_perm('change_task', task) diff -Nru django-guardian-1.1.1/docs/userguide/custom-user-model.rst django-guardian-1.2.0/docs/userguide/custom-user-model.rst --- django-guardian-1.1.1/docs/userguide/custom-user-model.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/userguide/custom-user-model.rst 2014-07-22 09:46:49.000000000 +0000 @@ -21,3 +21,44 @@ .. seealso:: Read more about customizing User model introduced in Django 1.5 here: https://docs.djangoproject.com/en/1.5/topics/auth/customizing/#substituting-a-custom-user-model. + + +.. _custom-user-model-anonymous: + +Anonymous user creation +----------------------- + +It is also possible to override default behavior of how instance for anonymous +user is created. In example, let's imagine we have our user model as follows:: + + + from django.contrib.auth.models import AbstractUser + from django.db import models + + + class CustomUser(AbstractUser): + real_username = models.CharField(max_length=120, unique=True) + birth_date = models.DateField() # field without default value + + USERNAME_FIELD = 'real_username' + + +Note that there is a ``birth_date`` field defined at the model and it does not +have a default value. It would fail to create anonymous user instance as +default implementation cannot know anything about ``CustomUser`` model. + +In order to override the way anonymous instance is created we need to make +:setting:`GUARDIAN_GET_INIT_ANONYMOUS_USER` pointing at our custom +implementation. In example, let's define our init function:: + + import datetime + + + def get_anonymous_user_instance(User): + return User(real_username='Anonymous', birth_date=datetime.date(1970, 1, 1)) + + +and put it at ``myapp/models.py``. Last step is to set proper configuration in +our settings module:: + + GUARDIAN_GET_INIT_ANONYMOUS_USER = 'myapp.models.get_anonymous_user_instance' diff -Nru django-guardian-1.1.1/docs/userguide/performance.rst django-guardian-1.2.0/docs/userguide/performance.rst --- django-guardian-1.1.1/docs/userguide/performance.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/docs/userguide/performance.rst 2014-07-22 09:46:49.000000000 +0000 @@ -1,6 +1,6 @@ .. _performance: -Performance tunning +Performance tuning =================== It is important to remember that by default ``django-guardian`` uses generic @@ -8,7 +8,7 @@ probably good enough, however if we have a lot of queries being spanned and our database seems to be choking it might be a good choice to use *direct* foreign keys. Let's start with quick overview of how generic solution work and -then we will move on to the tunning part. +then we will move on to the tuning part. Default, generic solution diff -Nru django-guardian-1.1.1/docs/watch-docs.sh django-guardian-1.2.0/docs/watch-docs.sh --- django-guardian-1.1.1/docs/watch-docs.sh 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/docs/watch-docs.sh 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +DIR="." +CMD="make html" +NOTIFY='growlnotify guardian Documentation -m Recreated' + + +# Run command +echo " => Documentation would be available at file://$PWD/build/html/index.html" +$CMD +$NOTIFY + +# Run command on .rst file change. +watchmedo shell-command --pattern "*.rst" --recursive -w -c "clear && $CMD && $NOTIFY" $DIR + diff -Nru django-guardian-1.1.1/example_project/core/models.py django-guardian-1.2.0/example_project/core/models.py --- django-guardian-1.1.1/example_project/core/models.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/core/models.py 2014-07-22 09:46:34.000000000 +0000 @@ -1,7 +1,22 @@ from django.contrib.auth.models import AbstractUser from django.db import models +import datetime class CustomUser(AbstractUser): + real_username = models.CharField(max_length=120, unique=True) birth_date = models.DateField(null=True, blank=True) + USERNAME_FIELD = 'real_username' + + def save(self, *args, **kwargs): + if not self.real_username: + self.real_username = self.username + return super(CustomUser, self).save(*args, **kwargs) + + +def get_custom_anon_user(User): + return User( + real_username='AnonymousUser', + birth_date=datetime.date(1410, 7, 15), + ) diff -Nru django-guardian-1.1.1/example_project/integration_tests/tests.py django-guardian-1.2.0/example_project/integration_tests/tests.py --- django-guardian-1.1.1/example_project/integration_tests/tests.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/example_project/integration_tests/tests.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,17 @@ +from django.test import TestCase + +from guardian.conf import settings +from guardian.compat import get_user_model +from guardian.management import create_anonymous_user + + +User = get_user_model() + + +class CustomUserTests(TestCase): + def test_create_anonymous_user(self): + create_anonymous_user(object()) + self.assertEqual(1, User.objects.all().count()) + anonymous = User.objects.all()[0] + self.assertEqual(anonymous.pk, settings.ANONYMOUS_USER_ID) + diff -Nru django-guardian-1.1.1/example_project/manage.py django-guardian-1.2.0/example_project/manage.py --- django-guardian-1.1.1/example_project/manage.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/manage.py 2014-07-22 09:46:34.000000000 +0000 @@ -1,19 +1,17 @@ #!/usr/bin/env python import django +import os import sys -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + +if django.VERSION < (1, 5): + sys.stderr.write("ERROR: guardian's example project must be run with " + "Django 1.5 or later!\n") sys.exit(1) -def main(): - if django.VERSION < (1, 3): - sys.stderr.write("guardian's example project requires Django 1.3+\n") - sys.exit(1) - execute_manager(settings) if __name__ == "__main__": - main() + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + + from django.core.management import execute_from_command_line + execute_from_command_line(sys.argv) diff -Nru django-guardian-1.1.1/example_project/.post_test.sh django-guardian-1.2.0/example_project/.post_test.sh --- django-guardian-1.1.1/example_project/.post_test.sh 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/.post_test.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh -DB_NAME=".hidden.db" -DB_BAK_NAME=".hidden.db.bak" - -if [ -f $DB_BAK_NAME ]; then - mv $DB_BAK_NAME $DB_NAME -fi - diff -Nru django-guardian-1.1.1/example_project/.pre_test.sh django-guardian-1.2.0/example_project/.pre_test.sh --- django-guardian-1.1.1/example_project/.pre_test.sh 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/.pre_test.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh -DB_NAME=".hidden.db" -DB_BAK_NAME=".hidden.db.bak" - -if [ -f $DB_BAK_NAME ]; then - mv $DB_NAME $DB_BAK_NAME -fi - diff -Nru django-guardian-1.1.1/example_project/requirements.txt django-guardian-1.2.0/example_project/requirements.txt --- django-guardian-1.1.1/example_project/requirements.txt 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/requirements.txt 2014-07-22 09:46:34.000000000 +0000 @@ -1,4 +1,3 @@ -Django==1.5.1 -distribute==0.6.34 +Django==1.6 mock==1.0.1 -wsgiref==0.1.2 +django-rosetta==0.7.3 diff -Nru django-guardian-1.1.1/example_project/settings.py django-guardian-1.2.0/example_project/settings.py --- django-guardian-1.1.1/example_project/settings.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/settings.py 2014-07-22 09:46:34.000000000 +0000 @@ -34,16 +34,22 @@ 'django.contrib.admin', 'django.contrib.messages', 'django.contrib.staticfiles', - 'guardian', - 'guardian.tests.testapp', + 'guardian.testapp', 'posts', + 'core', + 'integration_tests', ) if django.VERSION < (1, 3): INSTALLED_APPS += ('staticfiles',) else: INSTALLED_APPS += ('django.contrib.staticfiles',) +if 'GUARDIAN_NO_TESTS_APP' in os.environ: + _apps = list(INSTALLED_APPS) + _apps.remove('guardian.testapp') + INSTALLED_APPS = tuple(_apps) + if TEST_SOUTH: INSTALLED_APPS += ('south',) if 'GRAPPELLI' in os.environ: @@ -53,6 +59,12 @@ except ImportError: print("django-grappelli not installed") +try: + import rosetta + INSTALLED_APPS += ('rosetta',) +except ImportError: + pass + #MIDDLEWARE_CLASSES = ( #'django.middleware.common.CommonMiddleware', #'django.contrib.sessions.middleware.SessionMiddleware', @@ -100,16 +112,18 @@ ) ANONYMOUS_USER_ID = -1 +GUARDIAN_GET_INIT_ANONYMOUS_USER = 'core.models.get_custom_anon_user' + +PASSWORD_HASHERS = ( + 'django.contrib.auth.hashers.MD5PasswordHasher', + 'django.contrib.auth.hashers.SHA1PasswordHasher', +) # Neede as some models (located at guardian/tests/models.py) # are not migrated for tests SOUTH_TESTS_MIGRATE = TEST_SOUTH -# Django >= 1.5 (earlier versoions would ignore this setting; we don't want this -# however, to be set for earlier versions so we don't relay on it) -if django.VERSION >= (1, 5): - INSTALLED_APPS += ('core',) - AUTH_USER_MODEL = 'core.CustomUser' +AUTH_USER_MODEL = 'core.CustomUser' try: from conf.localsettings import * diff -Nru django-guardian-1.1.1/example_project/urls.py django-guardian-1.2.0/example_project/urls.py --- django-guardian-1.1.1/example_project/urls.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/example_project/urls.py 2014-07-22 09:46:34.000000000 +0000 @@ -19,3 +19,7 @@ (r'^grappelli/', include('grappelli.urls')), ) +if 'rosetta' in settings.INSTALLED_APPS: + urlpatterns = patterns('', + url(r'^rosetta/', include('rosetta.urls')), + ) + urlpatterns diff -Nru django-guardian-1.1.1/guardian/admin.py django-guardian-1.2.0/guardian/admin.py --- django-guardian-1.1.1/guardian/admin.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/admin.py 2014-07-22 09:46:49.000000000 +0000 @@ -42,76 +42,10 @@ return FilteredSelectMultiple(_("Permissions"), False) -class GuardedModelAdmin(admin.ModelAdmin): +class GuardedModelAdminMixin(object): """ - Extends ``django.contrib.admin.ModelAdmin`` class. Provides some extra - views for object permissions management at admin panel. It also changes - default ``change_form_template`` option to - ``'admin/guardian/model/change_form.html'`` which is required for proper - url (object permissions related) being shown at the model pages. - - **Extra options** - - ``GuardedModelAdmin.obj_perms_manage_template`` - - *Default*: ``admin/guardian/model/obj_perms_manage.html`` - - ``GuardedModelAdmin.obj_perms_manage_user_template`` - - *Default*: ``admin/guardian/model/obj_perms_manage_user.html`` - - ``GuardedModelAdmin.obj_perms_manage_group_template`` - - *Default*: ``admin/guardian/model/obj_perms_manage_group.html`` - - ``GuardedModelAdmin.user_can_access_owned_objects_only`` - - *Default*: ``False`` - - If this would be set to ``True``, ``request.user`` would be used to - filter out objects he or she doesn't own (checking ``user`` field - of used model - field name may be overridden by - ``user_owned_objects_field`` option). - - .. note:: - Please remember that this will **NOT** affect superusers! - Admins would still see all items. - - ``GuardedModelAdmin.user_can_access_owned_by_group_objects_only`` - - *Default*: ``False`` - - If this would be set to ``True``, ``request.user`` would be used to - filter out objects her or his group doesn't own (checking if any group - user belongs to is set as ``group`` field of the object; name of the - field can be changed by overriding ``group_owned_objects_field``). - - .. note:: - Please remember that this will **NOT** affect superusers! - Admins would still see all items. - - ``GuardedModelAdmin.group_owned_objects_field`` - - *Default*: ``group`` - - **Usage example** - - Just use :admin:`GuardedModelAdmin` instead of - ``django.contrib.admin.ModelAdmin``. - - .. code-block:: python - - from django.contrib import admin - from guardian.admin import GuardedModelAdmin - from myapp.models import Author - - class AuthorAdmin(GuardedModelAdmin): - pass - - admin.site.register(Author, AuthorAdmin) - + Serves as a helper for custom subclassing ``admin.ModelAdmin``. """ - change_form_template = \ 'admin/guardian/model/change_form.html' obj_perms_manage_template = \ @@ -124,9 +58,10 @@ user_owned_objects_field = 'user' user_can_access_owned_by_group_objects_only = False group_owned_objects_field = 'group' + include_object_permissions_urls = True def queryset(self, request): - qs = super(GuardedModelAdmin, self).queryset(request) + qs = super(GuardedModelAdminMixin, self).queryset(request) if request.user.is_superuser: return qs @@ -141,6 +76,7 @@ qs = qs.filter(**filters) return qs + def get_urls(self): """ Extends standard admin model urls with the following: @@ -154,22 +90,24 @@ ``/admin/flatpages/1/``) """ - urls = super(GuardedModelAdmin, self).get_urls() - info = self.model._meta.app_label, self.model._meta.module_name - myurls = patterns('', - url(r'^(?P.+)/permissions/$', - view=self.admin_site.admin_view(self.obj_perms_manage_view), - name='%s_%s_permissions' % info), - url(r'^(?P.+)/permissions/user-manage/(?P\-?\d+)/$', - view=self.admin_site.admin_view( - self.obj_perms_manage_user_view), - name='%s_%s_permissions_manage_user' % info), - url(r'^(?P.+)/permissions/group-manage/(?P\-?\d+)/$', - view=self.admin_site.admin_view( - self.obj_perms_manage_group_view), - name='%s_%s_permissions_manage_group' % info), - ) - return myurls + urls + urls = super(GuardedModelAdminMixin, self).get_urls() + if self.include_object_permissions_urls: + info = self.model._meta.app_label, self.model._meta.module_name + myurls = patterns('', + url(r'^(?P.+)/permissions/$', + view=self.admin_site.admin_view(self.obj_perms_manage_view), + name='%s_%s_permissions' % info), + url(r'^(?P.+)/permissions/user-manage/(?P\-?\d+)/$', + view=self.admin_site.admin_view( + self.obj_perms_manage_user_view), + name='%s_%s_permissions_manage_user' % info), + url(r'^(?P.+)/permissions/group-manage/(?P\-?\d+)/$', + view=self.admin_site.admin_view( + self.obj_perms_manage_group_view), + name='%s_%s_permissions_manage_group' % info), + ) + urls = myurls + urls + return urls def get_obj_perms_base_context(self, request, obj): """ @@ -202,7 +140,9 @@ users_perms = SortedDict( get_users_with_perms(obj, attach_perms=True, with_group_users=False)) - users_perms.keyOrder.sort(key=lambda user: user.username) + + users_perms.keyOrder.sort(key=lambda user: + getattr(user, get_user_model().USERNAME_FIELD)) groups_perms = SortedDict( get_groups_with_perms(obj, attach_perms=True)) groups_perms.keyOrder.sort(key=lambda group: group.name) @@ -371,23 +311,107 @@ return AdminGroupObjectPermissionsForm +class GuardedModelAdmin(GuardedModelAdminMixin, admin.ModelAdmin): + """ + Extends ``django.contrib.admin.ModelAdmin`` class. Provides some extra + views for object permissions management at admin panel. It also changes + default ``change_form_template`` option to + ``'admin/guardian/model/change_form.html'`` which is required for proper + url (object permissions related) being shown at the model pages. + + **Extra options** + + ``GuardedModelAdmin.obj_perms_manage_template`` + + *Default*: ``admin/guardian/model/obj_perms_manage.html`` + + ``GuardedModelAdmin.obj_perms_manage_user_template`` + + *Default*: ``admin/guardian/model/obj_perms_manage_user.html`` + + ``GuardedModelAdmin.obj_perms_manage_group_template`` + + *Default*: ``admin/guardian/model/obj_perms_manage_group.html`` + + ``GuardedModelAdmin.user_can_access_owned_objects_only`` + + *Default*: ``False`` + + If this would be set to ``True``, ``request.user`` would be used to + filter out objects he or she doesn't own (checking ``user`` field + of used model - field name may be overridden by + ``user_owned_objects_field`` option). + + .. note:: + Please remember that this will **NOT** affect superusers! + Admins would still see all items. + + ``GuardedModelAdmin.user_can_access_owned_by_group_objects_only`` + + *Default*: ``False`` + + If this would be set to ``True``, ``request.user`` would be used to + filter out objects her or his group doesn't own (checking if any group + user belongs to is set as ``group`` field of the object; name of the + field can be changed by overriding ``group_owned_objects_field``). + + .. note:: + Please remember that this will **NOT** affect superusers! + Admins would still see all items. + + ``GuardedModelAdmin.group_owned_objects_field`` + + *Default*: ``group`` + + ``GuardedModelAdmin.include_object_permissions_urls`` + + *Default*: ``True`` + + .. versionadded:: 1.2 + + Might be set to ``False`` in order **NOT** to include guardian-specific + urls. + + **Usage example** + + Just use :admin:`GuardedModelAdmin` instead of + ``django.contrib.admin.ModelAdmin``. + + .. code-block:: python + + from django.contrib import admin + from guardian.admin import GuardedModelAdmin + from myapp.models import Author + + class AuthorAdmin(GuardedModelAdmin): + pass + + admin.site.register(Author, AuthorAdmin) + + """ + + class UserManage(forms.Form): - user = forms.RegexField(label=_("Username"), max_length=30, - regex=r'^[\w.@+-]+$', - error_messages = { - 'invalid': _("This value may contain only letters, numbers and " - "@/./+/-/_ characters."), - 'does_not_exist': _("This user does not exist")}) + user = forms.CharField(label=_("User identification"), + max_length=200, + error_messages = {'does_not_exist': _("This user does not exist")}, + help_text=_('Enter a value compatible with User.USERNAME_FIELD') + ) def clean_user(self): """ - Returns ``User`` instance based on the given username. + Returns ``User`` instance based on the given identification. """ - username = self.cleaned_data['user'] + identification = self.cleaned_data['user'] + user_model = get_user_model() + try: + username_field = user_model.USERNAME_FIELD + except AttributeError: + username_field = 'username' try: - user = get_user_model().objects.get(username=username) + user = user_model.objects.get(**{username_field: identification}) return user - except get_user_model().DoesNotExist: + except user_model.DoesNotExist: raise forms.ValidationError( self.fields['user'].error_messages['does_not_exist']) diff -Nru django-guardian-1.1.1/guardian/apps.py django-guardian-1.2.0/guardian/apps.py --- django-guardian-1.1.1/guardian/apps.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/apps.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,10 @@ + +from django.apps import AppConfig +from . import monkey_patch_user + +class GuardianConfig(AppConfig): + name = 'guardian' + + def ready(self): + monkey_patch_user() + diff -Nru django-guardian-1.1.1/guardian/backends.py django-guardian-1.2.0/guardian/backends.py --- django-guardian-1.1.1/guardian/backends.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/backends.py 2014-07-22 09:46:34.000000000 +0000 @@ -45,6 +45,9 @@ # This is how we support anonymous users - simply try to retrieve User # instance and perform checks for that predefined user if not user_obj.is_authenticated(): + # If anonymous user permission is disabled then they are always unauthorized + if settings.ANONYMOUS_USER_ID is None: + return False user_obj = get_user_model().objects.get(pk=settings.ANONYMOUS_USER_ID) # Do not check any further if user is not active diff -Nru django-guardian-1.1.1/guardian/compat.py django-guardian-1.2.0/guardian/compat.py --- django-guardian-1.1.1/guardian/compat.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/compat.py 2014-07-22 09:46:34.000000000 +0000 @@ -4,6 +4,9 @@ from django.contrib.auth.models import Group from django.contrib.auth.models import Permission from django.contrib.auth.models import AnonymousUser +from django.utils.importlib import import_module +import six +import sys try: from django.conf.urls import url, patterns, include, handler404, handler500 @@ -16,14 +19,32 @@ 'Permission', 'AnonymousUser', 'get_user_model', + 'import_string', 'user_model_label', 'url', 'patterns', 'include', 'handler404', - 'handler500' + 'handler500', + 'mock', + 'unittest', ] +try: + import unittest2 as unittest +except ImportError: + import unittest # pyflakes:ignore +try: + from unittest import mock # Since Python 3.3 mock is is in stdlib +except ImportError: + try: + import mock # pyflakes:ignore + except ImportError: + # mock is used for tests only however it is hard to check if user is + # running tests or production code so we fail silently here; mock is + # still required for tests at setup.py (See PR #193) + pass + # Django 1.5 compatibility utilities, providing support for custom User models. # Since get_user_model() causes a circular import if called when app models are # being loaded, the user_model_label should be used when possible, with calls @@ -62,6 +83,30 @@ """ return get_user_permission_full_codename(perm).split('.')[1] + +def import_string(dotted_path): + """ + Import a dotted module path and return the attribute/class designated by the + last name in the path. Raise ImportError if the import failed. + + Backported from Django 1.7 + """ + try: + module_path, class_name = dotted_path.rsplit('.', 1) + except ValueError: + msg = "%s doesn't look like a module path" % dotted_path + six.reraise(ImportError, ImportError(msg), sys.exc_info()[2]) + + module = import_module(module_path) + + try: + return getattr(module, class_name) + except AttributeError: + msg = 'Module "%s" does not define a "%s" attribute/class' % ( + dotted_path, class_name) + six.reraise(ImportError, ImportError(msg), sys.exc_info()[2]) + + # Python 3 try: unicode = unicode # pyflakes:ignore @@ -70,4 +115,17 @@ except NameError: basestring = unicode = str = str +# Django 1.7 compatibility +# create_permission API changed: skip the create_models (second +# positional argument) if we have django 1.7+ and 2+ positional +# arguments with the second one being a list/tuple +def create_permissions(*args, **kwargs): + from django.contrib.auth.management import create_permissions as original_create_permissions + import django + + if django.get_version().split('.')[:2] >= ['1','7'] and \ + len(args) > 1 and isinstance(args[1], (list, tuple)): + args = args[:1] + args[2:] + return original_create_permissions(*args, **kwargs) + __all__ = ['User', 'Group', 'Permission', 'AnonymousUser'] diff -Nru django-guardian-1.1.1/guardian/conf/settings.py django-guardian-1.2.0/guardian/conf/settings.py --- django-guardian-1.1.1/guardian/conf/settings.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/conf/settings.py 2014-07-22 09:46:49.000000000 +0000 @@ -4,8 +4,10 @@ ANONYMOUS_DEFAULT_USERNAME_VALUE = getattr(settings, 'ANONYMOUS_DEFAULT_USERNAME_VALUE', 'AnonymousUser') -ANONYMOUS_USER_ID = getattr(settings, 'ANONYMOUS_USER_ID', None) -if ANONYMOUS_USER_ID is None: + +try: + ANONYMOUS_USER_ID = settings.ANONYMOUS_USER_ID +except AttributeError: raise ImproperlyConfigured("In order to use django-guardian's " "ObjectPermissionBackend authorization backend you have to configure " "ANONYMOUS_USER_ID at your settings module") @@ -13,6 +15,8 @@ RENDER_403 = getattr(settings, 'GUARDIAN_RENDER_403', False) TEMPLATE_403 = getattr(settings, 'GUARDIAN_TEMPLATE_403', '403.html') RAISE_403 = getattr(settings, 'GUARDIAN_RAISE_403', False) +GET_INIT_ANONYMOUS_USER = getattr(settings, 'GUARDIAN_GET_INIT_ANONYMOUS_USER', + 'guardian.management.get_init_anonymous_user') def check_configuration(): if RENDER_403 and RAISE_403: diff -Nru django-guardian-1.1.1/guardian/core.py django-guardian-1.2.0/guardian/core.py --- django-guardian-1.1.1/guardian/core.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/core.py 2014-07-22 09:46:34.000000000 +0000 @@ -60,6 +60,8 @@ :param obj: Django model instance for which permission should be checked """ + if self.user and not self.user.is_active: + return [] User = get_user_model() ctype = ContentType.objects.get_for_model(obj) key = self.get_local_cache_key(obj) @@ -83,9 +85,7 @@ else: group_filters['%s__content_object' % group_rel_name] = obj - if self.user and not self.user.is_active: - return [] - elif self.user and self.user.is_superuser: + if self.user and self.user.is_superuser: perms = list(chain(*Permission.objects .filter(content_type=ctype) .values_list("codename"))) diff -Nru django-guardian-1.1.1/guardian/decorators.py django-guardian-1.2.0/guardian/decorators.py --- django-guardian-1.1.1/guardian/decorators.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/decorators.py 2014-07-22 09:46:34.000000000 +0000 @@ -19,7 +19,10 @@ Optionally, instances for which check should be made may be passed as an second argument or as a tuple parameters same as those passed to - ``get_object_or_404`` but must be provided as pairs of strings. + ``get_object_or_404`` but must be provided as pairs of strings. This way + decorator can fetch i.e. ``User`` instance based on performed request and + check permissions on it (without this, one would need to fetch user instance + at view's logic and check permission inside a view). :param login_url: if denied, user would be redirected to location set by this parameter. Defaults to ``django.conf.settings.LOGIN_URL``. @@ -44,12 +47,23 @@ @permission_required('auth.change_user', (User, 'username', 'username')) def my_view(request, username): + ''' + auth.change_user permission would be checked based on given + 'username'. If view's parameter would be named ``name``, we would + rather use following decorator:: + + @permission_required('auth.change_user', (User, 'username', 'name')) + ''' user = get_object_or_404(User, username=username) return user.get_absolute_url() @permission_required('auth.change_user', (User, 'username', 'username', 'groups__name', 'group_name')) def my_view(request, username, group_name): + ''' + Similar to the above example, here however we also make sure that + one of user's group is named same as request's ``group_name`` param. + ''' user = get_object_or_404(User, username=username, group__name=group_name) return user.get_absolute_url() diff -Nru django-guardian-1.1.1/guardian/__init__.py django-guardian-1.2.0/guardian/__init__.py --- django-guardian-1.1.1/guardian/__init__.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/__init__.py 2014-07-22 09:46:49.000000000 +0000 @@ -3,7 +3,7 @@ """ from __future__ import unicode_literals -VERSION = (1, 1, 1) +VERSION = (1, 2, 0) __version__ = '.'.join((str(each) for each in VERSION[:4])) @@ -13,3 +13,19 @@ """ return '.'.join((str(each) for each in VERSION[:4])) + +default_app_config = 'guardian.apps.GuardianConfig' + + +def monkey_patch_user(): + from .compat import get_user_model + from .utils import get_anonymous_user + from .models import UserObjectPermission + User = get_user_model() + # Prototype User and Group methods + setattr(User, 'get_anonymous', staticmethod(lambda: get_anonymous_user())) + setattr(User, 'add_obj_perm', + lambda self, perm, obj: UserObjectPermission.objects.assign_perm(perm, self, obj)) + setattr(User, 'del_obj_perm', + lambda self, perm, obj: UserObjectPermission.objects.remove_perm(perm, self, obj)) + Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/guardian/locale/pl/LC_MESSAGES/django.mo and /tmp/AGly5zYG9L/django-guardian-1.2.0/guardian/locale/pl/LC_MESSAGES/django.mo differ diff -Nru django-guardian-1.1.1/guardian/locale/pl/LC_MESSAGES/django.po django-guardian-1.2.0/guardian/locale/pl/LC_MESSAGES/django.po --- django-guardian-1.1.1/guardian/locale/pl/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/locale/pl/LC_MESSAGES/django.po 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,157 @@ +# Polish translation of django-guardian. +# This file is distributed under the same license as django-guardian's package. +# Translator: Tomasz Wsuł <2nickers@gmail.com>, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: django-guardian 1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-12-29 00:14+0100\n" +"PO-Revision-Date: 2013-12-29 17:29-0600\n" +"Last-Translator: <2nickers@gmail.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Translated-Using: django-rosetta 0.7.3\n" + +#: admin.py:32 admin.py:42 forms.py:55 +msgid "Permissions" +msgstr "Uprawnienia" + +#: admin.py:189 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:12 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:14 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:25 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:14 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:25 +#: templates/admin/guardian/model/change_form.html:5 +#: templates/admin/guardian/model/obj_perms_manage.html:17 +#: templates/admin/guardian/model/obj_perms_manage_group.html:14 +#: templates/admin/guardian/model/obj_perms_manage_group.html:25 +#: templates/admin/guardian/model/obj_perms_manage_user.html:14 +#: templates/admin/guardian/model/obj_perms_manage_user.html:25 +msgid "Object permissions" +msgstr "Uprawnienia do obiektu" + +#: admin.py:278 admin.py:331 +msgid "Permissions saved." +msgstr "Zapisano uprawnienia." + +#: admin.py:375 +msgid "Username" +msgstr "Użytkownik" + +#: admin.py:378 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Ta wartość może zawierać tylko litery, cyfry oraz symbole @/./+/-/_" + +#: admin.py:380 +msgid "This user does not exist" +msgstr "Ten użytkownik nie istnieje" + +#: admin.py:397 +msgid "This group does not exist" +msgstr "Ta grupa nie istnieje" + +#: models.py:46 +msgid "object ID" +msgstr "ID obiektu" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:8 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:10 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:10 +#: templates/admin/guardian/model/obj_perms_manage.html:13 +#: templates/admin/guardian/model/obj_perms_manage_group.html:10 +#: templates/admin/guardian/model/obj_perms_manage_user.html:10 +msgid "Home" +msgstr "Start" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:21 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:82 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Proszę poprawić poniższe błędy." +msgstr[1] "Proszę poprawić poniższy błąd." + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:25 +#: templates/admin/guardian/model/obj_perms_manage.html:32 +msgid "Users" +msgstr "Użytkownicy" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:28 +#: templates/admin/guardian/model/obj_perms_manage.html:38 +msgid "User permissions" +msgstr "Uprawnienia użytkownika" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:33 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:34 +#: templates/admin/guardian/model/obj_perms_manage.html:41 +#: templates/admin/guardian/model/obj_perms_manage_user.html:30 +msgid "User" +msgstr "Użytkownik" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:37 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:98 +#: templates/admin/guardian/model/obj_perms_manage.html:45 +#: templates/admin/guardian/model/obj_perms_manage.html:99 +msgid "Action" +msgstr "Akcja" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:54 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:115 +#: templates/admin/guardian/model/obj_perms_manage.html:62 +#: templates/admin/guardian/model/obj_perms_manage.html:116 +msgid "Edit" +msgstr "Edytuj" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:70 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:15 +#: templates/admin/guardian/model/obj_perms_manage.html:73 +#: templates/admin/guardian/model/obj_perms_manage_user.html:15 +msgid "Manage user" +msgstr "Zarządzaj użytkownikiem" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:86 +#: templates/admin/guardian/model/obj_perms_manage.html:86 +msgid "Groups" +msgstr "Grupy" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:89 +#: templates/admin/guardian/model/obj_perms_manage.html:92 +msgid "Group permissions" +msgstr "Uprawnienia grupy" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:94 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:34 +#: templates/admin/guardian/model/obj_perms_manage.html:95 +#: templates/admin/guardian/model/obj_perms_manage_group.html:30 +msgid "Group" +msgstr "Grupa" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:132 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:15 +#: templates/admin/guardian/model/obj_perms_manage.html:127 +#: templates/admin/guardian/model/obj_perms_manage_group.html:15 +msgid "Manage group" +msgstr "Zarządzaj grupą" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:28 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:28 +#: templates/admin/guardian/model/obj_perms_manage_group.html:27 +#: templates/admin/guardian/model/obj_perms_manage_user.html:27 +msgid "Object" +msgstr "Obiekt" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:45 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:45 +#: templates/admin/guardian/model/obj_perms_manage_group.html:37 +#: templates/admin/guardian/model/obj_perms_manage_user.html:37 +msgid "Save" +msgstr "Zapisz" + +#: templates/admin/guardian/model/obj_perms_manage.html:28 +#: templates/admin/guardian/model/obj_perms_manage.html:82 +msgid "Please correct the errors below." +msgstr "Proszę poprawić poniższe błędy." Binary files /tmp/AZiCrXehr2/django-guardian-1.1.1/guardian/locale/pt_BR/LC_MESSAGES/django.mo and /tmp/AGly5zYG9L/django-guardian-1.2.0/guardian/locale/pt_BR/LC_MESSAGES/django.mo differ diff -Nru django-guardian-1.1.1/guardian/locale/pt_BR/LC_MESSAGES/django.po django-guardian-1.2.0/guardian/locale/pt_BR/LC_MESSAGES/django.po --- django-guardian-1.1.1/guardian/locale/pt_BR/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/locale/pt_BR/LC_MESSAGES/django.po 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,159 @@ +# django-guardian +# Copyright (c) 2010-2013 Lukasz Balcerzak +# This file is distributed under the same license as the PACKAGE package. +# Fabio C. Barrionuevo da Luz , 2013. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-12-14 02:39-0300\n" +"PO-Revision-Date: 2013-12-14 02:39-0300\n" +"Last-Translator: Fabio C. Barrionuevo da Luz \n" +"Language-Team: pt_BR \n" +"Language: Brazilian Portuguese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: admin.py:32 admin.py:42 forms.py:55 +msgid "Permissions" +msgstr "Permissões" + +#: admin.py:189 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:12 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:14 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:25 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:14 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:25 +#: templates/admin/guardian/model/change_form.html:5 +#: templates/admin/guardian/model/obj_perms_manage.html:17 +#: templates/admin/guardian/model/obj_perms_manage_group.html:14 +#: templates/admin/guardian/model/obj_perms_manage_group.html:25 +#: templates/admin/guardian/model/obj_perms_manage_user.html:14 +#: templates/admin/guardian/model/obj_perms_manage_user.html:25 +msgid "Object permissions" +msgstr "Permissões para Objetos" + +#: admin.py:280 admin.py:333 +msgid "Permissions saved." +msgstr "Permissões salvas" + +#: admin.py:377 +msgid "User identification" +msgstr "Identificação de Usuário" + +#: admin.py:379 +msgid "This user does not exist" +msgstr "Este usuário não existe" + +#: admin.py:380 +msgid "Enter a value compatible with User.USERNAME_FIELD" +msgstr "Insira um valor compatível com User.USERNAME_FIELD" + +#: admin.py:403 +msgid "This group does not exist" +msgstr "Este grupo não existe" + +#: models.py:46 +msgid "object ID" +msgstr "id do objeto" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:8 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:10 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:10 +#: templates/admin/guardian/model/obj_perms_manage.html:13 +#: templates/admin/guardian/model/obj_perms_manage_group.html:10 +#: templates/admin/guardian/model/obj_perms_manage_user.html:10 +msgid "Home" +msgstr "Home" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:21 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:82 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Por favor, corrija o erro abaixo." +msgstr[1] "Por favor, corrija os erros abaixo." + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:25 +#: templates/admin/guardian/model/obj_perms_manage.html:32 +msgid "Users" +msgstr "Usuários" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:28 +#: templates/admin/guardian/model/obj_perms_manage.html:38 +msgid "User permissions" +msgstr "Permissões de usuários" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:33 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:34 +#: templates/admin/guardian/model/obj_perms_manage.html:41 +#: templates/admin/guardian/model/obj_perms_manage_user.html:30 +msgid "User" +msgstr "Usuário" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:37 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:98 +#: templates/admin/guardian/model/obj_perms_manage.html:45 +#: templates/admin/guardian/model/obj_perms_manage.html:99 +msgid "Action" +msgstr "Ação" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:54 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:115 +#: templates/admin/guardian/model/obj_perms_manage.html:62 +#: templates/admin/guardian/model/obj_perms_manage.html:116 +msgid "Edit" +msgstr "Editar" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:70 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:15 +#: templates/admin/guardian/model/obj_perms_manage.html:73 +#: templates/admin/guardian/model/obj_perms_manage_user.html:15 +msgid "Manage user" +msgstr "Gerênciar usuário" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:86 +#: templates/admin/guardian/model/obj_perms_manage.html:86 +msgid "Groups" +msgstr "Grupos" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:89 +#: templates/admin/guardian/model/obj_perms_manage.html:92 +msgid "Group permissions" +msgstr "Grupos de permissões" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:94 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:34 +#: templates/admin/guardian/model/obj_perms_manage.html:95 +#: templates/admin/guardian/model/obj_perms_manage_group.html:30 +msgid "Group" +msgstr "Grupo" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage.html:132 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:15 +#: templates/admin/guardian/model/obj_perms_manage.html:127 +#: templates/admin/guardian/model/obj_perms_manage_group.html:15 +msgid "Manage group" +msgstr "Gerenciar grupo" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:28 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:28 +#: templates/admin/guardian/model/obj_perms_manage_group.html:27 +#: templates/admin/guardian/model/obj_perms_manage_user.html:27 +msgid "Object" +msgstr "Objeto" + +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_group.html:45 +#: templates/admin/guardian/contrib/grappelli/obj_perms_manage_user.html:45 +#: templates/admin/guardian/model/obj_perms_manage_group.html:37 +#: templates/admin/guardian/model/obj_perms_manage_user.html:37 +msgid "Save" +msgstr "Salvar" + +#: templates/admin/guardian/model/obj_perms_manage.html:28 +#: templates/admin/guardian/model/obj_perms_manage.html:82 +msgid "Please correct the errors below." +msgstr "Por favor, corrija os erros abaixo." diff -Nru django-guardian-1.1.1/guardian/management/__init__.py django-guardian-1.2.0/guardian/management/__init__.py --- django-guardian-1.1.1/guardian/management/__init__.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/management/__init__.py 2014-07-22 09:46:34.000000000 +0000 @@ -6,6 +6,21 @@ from guardian import models as guardian_app from guardian.conf import settings as guardian_settings from guardian.compat import get_user_model +from guardian.compat import import_string + + +def get_init_anonymous_user(User): + """ + Returns User model instance that would be referenced by guardian when + permissions are checked against users that haven't signed into the system. + + :param User: User model - result of ``django.contrib.auth.get_user_model``. + """ + kwargs = { + User.USERNAME_FIELD: guardian_settings.ANONYMOUS_DEFAULT_USERNAME_VALUE + } + return User(**kwargs) + def create_anonymous_user(sender, **kwargs): """ @@ -16,12 +31,18 @@ User.objects.get(pk=guardian_settings.ANONYMOUS_USER_ID) except User.DoesNotExist: if django.VERSION >= (1, 5): - User.objects.create(pk=guardian_settings.ANONYMOUS_USER_ID, - **{User.USERNAME_FIELD: guardian_settings.ANONYMOUS_DEFAULT_USERNAME_VALUE}) + retrieve_anonymous_functon = import_string( + guardian_settings.GET_INIT_ANONYMOUS_USER) + user = retrieve_anonymous_functon(User) + # Always set pk to the one pointed at settings + user.pk = guardian_settings.ANONYMOUS_USER_ID + user.save() else: User.objects.create(pk=guardian_settings.ANONYMOUS_USER_ID, username=guardian_settings.ANONYMOUS_DEFAULT_USERNAME_VALUE) -signals.post_syncdb.connect(create_anonymous_user, sender=guardian_app, - dispatch_uid="guardian.management.create_anonymous_user") +# Only create an anonymous user if support is enabled. +if guardian_settings.ANONYMOUS_USER_ID is not None: + signals.post_syncdb.connect(create_anonymous_user, sender=guardian_app, + dispatch_uid="guardian.management.create_anonymous_user") diff -Nru django-guardian-1.1.1/guardian/managers.py django-guardian-1.2.0/guardian/managers.py --- django-guardian-1.1.1/guardian/managers.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/managers.py 2014-07-22 09:46:34.000000000 +0000 @@ -43,12 +43,16 @@ def assign(self, perm, user, obj): """ Depreciated function name left in for compatibility""" - warnings.warn("UserObjectPermissionManager method 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 1.0.5 version.", DeprecationWarning) + warnings.warn("UserObjectPermissionManager method 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 2.0 version.", DeprecationWarning) return self.assign_perm(perm, user, obj) def remove_perm(self, perm, user, obj): """ Removes permission ``perm`` for an instance ``obj`` and given ``user``. + + Please note that we do NOT fetch object permission from database - we + use ``Queryset.delete`` method for removing it. Main implication of this + is that ``post_delete`` signals would NOT be fired. """ if getattr(obj, 'pk', None) is None: raise ObjectNotPersisted("Object %s needs to be persisted first" @@ -64,17 +68,6 @@ filters['content_object__pk'] = obj.pk self.filter(**filters).delete() - def get_for_object(self, user, obj): - if getattr(obj, 'pk', None) is None: - raise ObjectNotPersisted("Object %s needs to be persisted first" - % obj) - ctype = ContentType.objects.get_for_model(obj) - perms = self.filter( - content_type = ctype, - user = user, - ) - return perms - class GroupObjectPermissionManager(BaseObjectPermissionManager): @@ -100,7 +93,7 @@ def assign(self, perm, user, obj): """ Depreciated function name left in for compatibility""" - warnings.warn("UserObjectPermissionManager method 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 1.0.5 version.", DeprecationWarning) + warnings.warn("UserObjectPermissionManager method 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 2.0 version.", DeprecationWarning) return self.assign_perm(perm, user, obj) def remove_perm(self, perm, group, obj): @@ -121,15 +114,3 @@ filters['content_object__pk'] = obj.pk self.filter(**filters).delete() - - def get_for_object(self, group, obj): - if getattr(obj, 'pk', None) is None: - raise ObjectNotPersisted("Object %s needs to be persisted first" - % obj) - ctype = ContentType.objects.get_for_model(obj) - perms = self.filter( - content_type = ctype, - group = group, - ) - return perms - diff -Nru django-guardian-1.1.1/guardian/mixins.py django-guardian-1.2.0/guardian/mixins.py --- django-guardian-1.1.1/guardian/mixins.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/mixins.py 2014-07-22 09:46:49.000000000 +0000 @@ -108,6 +108,13 @@ `permission_required` - the permission to check of form "." i.e. 'polls.can_vote' for a permission on a model in the polls application. + + ``PermissionRequiredMixin.accept_global_perms`` + + *Default*: ``False``, If accept_global_perms would be set to True, then + mixing would first check for global perms, if none found, then it will + proceed to check object level permissions. + """ ### default class view settings login_url = settings.LOGIN_URL @@ -115,6 +122,7 @@ redirect_field_name = REDIRECT_FIELD_NAME return_403 = False raise_exception = False + accept_global_perms = False def get_required_permissions(self, request=None): """ @@ -152,6 +160,7 @@ login_url=self.login_url, redirect_field_name=self.redirect_field_name, return_403=self.return_403, + accept_global_perms=self.accept_global_perms ) if forbidden: self.on_permission_check_fail(request, forbidden, obj=obj) @@ -179,4 +188,3 @@ return response return super(PermissionRequiredMixin, self).dispatch(request, *args, **kwargs) - diff -Nru django-guardian-1.1.1/guardian/models.py django-guardian-1.2.0/guardian/models.py --- django-guardian-1.1.1/guardian/models.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/models.py 2014-07-22 09:46:49.000000000 +0000 @@ -8,10 +8,8 @@ from django.contrib.contenttypes.generic import GenericForeignKey from django.utils.translation import ugettext_lazy as _ -from guardian.compat import get_user_model from guardian.compat import user_model_label from guardian.compat import unicode -from guardian.utils import get_anonymous_user from guardian.managers import GroupObjectPermissionManager from guardian.managers import UserObjectPermissionManager @@ -86,13 +84,12 @@ unique_together = ['group', 'permission', 'object_pk'] -User = get_user_model() -# Prototype User and Group methods -setattr(User, 'get_anonymous', staticmethod(lambda: get_anonymous_user())) -setattr(User, 'add_obj_perm', - lambda self, perm, obj: UserObjectPermission.objects.assign_perm(perm, self, obj)) -setattr(User, 'del_obj_perm', - lambda self, perm, obj: UserObjectPermission.objects.remove_perm(perm, self, obj)) +# As with Django 1.7, you can't use the get_user_model at this point +# because the app registry isn't ready yet (we're inside a model file). +import django +if django.VERSION < (1, 7): + from . import monkey_patch_user + monkey_patch_user() setattr(Group, 'add_obj_perm', lambda self, perm, obj: GroupObjectPermission.objects.assign_perm(perm, self, obj)) diff -Nru django-guardian-1.1.1/guardian/shortcuts.py django-guardian-1.2.0/guardian/shortcuts.py --- django-guardian-1.1.1/guardian/shortcuts.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/shortcuts.py 2014-07-22 09:46:49.000000000 +0000 @@ -7,7 +7,7 @@ from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType from django.db import models -from django.db.models import Q +from django.db.models import Count, Q from django.shortcuts import _get_queryset from itertools import groupby @@ -16,6 +16,7 @@ from guardian.core import ObjectPermissionChecker from guardian.exceptions import MixedContentTypeError from guardian.exceptions import WrongAppError +from guardian.utils import get_anonymous_user from guardian.utils import get_identity from guardian.utils import get_user_obj_perms_model from guardian.utils import get_group_obj_perms_model @@ -39,7 +40,7 @@ We can assign permission for ``Model`` instance for specific user: >>> from django.contrib.sites.models import Site - >>> from guardian.models import User, Group + >>> from guardian.models import User >>> from guardian.shortcuts import assign_perm >>> site = Site.objects.get_current() >>> user = User.objects.create(username='joe') @@ -94,7 +95,7 @@ def assign(perm, user_or_group, obj=None): """ Depreciated function name left in for compatibility""" - warnings.warn("Shortcut function 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 1.0.5 version.", DeprecationWarning) + warnings.warn("Shortcut function 'assign' is being renamed to 'assign_perm'. Update your code accordingly as old name will be depreciated in 2.0 version.", DeprecationWarning) return assign_perm(perm, user_or_group, obj) def remove_perm(perm, user_or_group=None, obj=None): @@ -250,7 +251,7 @@ >>> >>> page = FlatPage.objects.create(title='Some page', path='/some/page/') >>> admins = Group.objects.create(name='Admins') - >>> assign_perm('change_flatpage', group, page) + >>> assign_perm('change_flatpage', admins, page) >>> >>> get_groups_with_perms(page) [] @@ -287,7 +288,8 @@ Returns queryset of objects for which a given ``user`` has *all* permissions present at ``perms``. - :param user: ``User`` instance for which objects would be returned + :param user: ``User`` or ``AnonymousUser`` instance for which objects would + be returned. :param perms: single permission string, or sequence of permission strings which should be checked. If ``klass`` parameter is not given, those should be full permission @@ -307,6 +309,7 @@ Example:: + >>> from django.contrib.auth.models import User >>> from guardian.shortcuts import get_objects_for_user >>> joe = User.objects.get(username='joe') >>> get_objects_for_user(joe, 'auth.change_group') @@ -377,6 +380,12 @@ if user.is_superuser: return queryset + # Check if the user is anonymous. The + # django.contrib.auth.models.AnonymousUser object doesn't work for queries + # and it's nice to be able to pass in request.user blindly. + if user.is_anonymous(): + user = get_anonymous_user() + # Now we should extract list of pk values for which we would filter queryset user_model = get_user_obj_perms_model(queryset.model) user_obj_perms_queryset = (user_model.objects @@ -387,31 +396,47 @@ fields = ['object_pk', 'permission__codename'] else: fields = ['content_object__pk', 'permission__codename'] - user_obj_perms = user_obj_perms_queryset.values_list(*fields) - data = list(user_obj_perms) + if use_groups: group_model = get_group_obj_perms_model(queryset.model) group_filters = { 'permission__content_type': ctype, 'permission__codename__in': codenames, - 'group__%s' % get_user_model()._meta.module_name: user, + 'group__%s' % get_user_model().groups.field.related_query_name(): user, } groups_obj_perms_queryset = group_model.objects.filter(**group_filters) if group_model.objects.is_generic(): fields = ['object_pk', 'permission__codename'] else: fields = ['content_object__pk', 'permission__codename'] - groups_obj_perms = groups_obj_perms_queryset.values_list(*fields) - data += list(groups_obj_perms) - keyfunc = lambda t: t[0] # sorting/grouping by pk (first in result tuple) - data = sorted(data, key=keyfunc) - pk_list = [] - for pk, group in groupby(data, keyfunc): - obj_codenames = set((e[1] for e in group)) - if any_perm or codenames.issubset(obj_codenames): - pk_list.append(pk) + if not any_perm: + user_obj_perms = user_obj_perms_queryset.values_list(*fields) + groups_obj_perms = groups_obj_perms_queryset.values_list(*fields) + data = list(user_obj_perms) + list(groups_obj_perms) + keyfunc = lambda t: t[0] # sorting/grouping by pk (first in result tuple) + data = sorted(data, key=keyfunc) + pk_list = [] + for pk, group in groupby(data, keyfunc): + obj_codenames = set((e[1] for e in group)) + if codenames.issubset(obj_codenames): + pk_list.append(pk) + objects = queryset.filter(pk__in=pk_list) + return objects + + if not any_perm: + counts = user_obj_perms_queryset.values(fields[0]).annotate(object_pk_count=Count(fields[0])) + user_obj_perms_queryset = counts.filter(object_pk_count__gte=len(codenames)) + + values = user_obj_perms_queryset.values_list(fields[0], flat=True) + if user_model.objects.is_generic(): + values = [int(v) for v in values] + objects = queryset.filter(pk__in=values) + if use_groups: + values = groups_obj_perms_queryset.values_list(fields[0], flat=True) + if group_model.objects.is_generic(): + values = [int(v) for v in values] + objects |= queryset.filter(pk__in=values) - objects = queryset.filter(pk__in=pk_list) return objects def get_objects_for_group(group, perms, klass=None, any_perm=False): diff -Nru django-guardian-1.1.1/guardian/templatetags/guardian_tags.py django-guardian-1.2.0/guardian/templatetags/guardian_tags.py --- django-guardian-1.1.1/guardian/templatetags/guardian_tags.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/templatetags/guardian_tags.py 2014-07-22 09:46:34.000000000 +0000 @@ -75,6 +75,8 @@ raise NotUserNorGroup("User or Group instance required (got %s)" % for_whom.__class__) obj = self.obj.resolve(context) + if not obj: + return '' check = ObjectPermissionChecker(for_whom) perms = check.get_perms(obj) @@ -109,6 +111,11 @@ Please remember that superusers would always get full list of permissions for a given object. + .. versionadded:: 1.2 + + As of v1.2, passing ``None`` as ``obj`` for this template tag won't rise + obfuscated exception and would return empty permissions set instead. + """ bits = token.split_contents() format = '{% get_obj_perms user/group for obj as "context_var" %}' diff -Nru django-guardian-1.1.1/guardian/testapp/__init__.py django-guardian-1.2.0/guardian/testapp/__init__.py --- django-guardian-1.1.1/guardian/testapp/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/__init__.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,2 @@ +from __future__ import unicode_literals + diff -Nru django-guardian-1.1.1/guardian/testapp/models.py django-guardian-1.2.0/guardian/testapp/models.py --- django-guardian-1.1.1/guardian/testapp/models.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/models.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,54 @@ +from __future__ import unicode_literals +from datetime import datetime +from django.db import models +from django.contrib.admin.models import LogEntry +from guardian.models import UserObjectPermissionBase, GroupObjectPermissionBase + + +class DynamicAccessor(object): + def __init__(self): + pass + + def __getattr__(self, key): + return DynamicAccessor() + + +class ProjectUserObjectPermission(UserObjectPermissionBase): + content_object = models.ForeignKey('Project') + + +class ProjectGroupObjectPermission(GroupObjectPermissionBase): + content_object = models.ForeignKey('Project') + + +class Project(models.Model): + name = models.CharField(max_length=128, unique=True) + created_at = models.DateTimeField(default=datetime.now) + + class Meta: + get_latest_by = 'created_at' + + def __unicode__(self): + return self.name + +Project.not_a_relation_descriptor = DynamicAccessor() + + +class MixedGroupObjectPermission(GroupObjectPermissionBase): + content_object = models.ForeignKey('Mixed') + + +class Mixed(models.Model): + """ + Model for tests obj perms checks with generic user object permissions model + and direct group object permissions model. + """ + name = models.CharField(max_length=128, unique=True) + + def __unicode__(self): + return self.name + + +class LogEntryWithGroup(LogEntry): + group = models.ForeignKey('auth.Group', null=True, blank=True) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/admin_test.py django-guardian-1.2.0/guardian/testapp/tests/admin_test.py --- django-guardian-1.1.1/guardian/testapp/tests/admin_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/admin_test.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,458 @@ +from __future__ import unicode_literals +import copy + +from django import forms +from django.conf import settings +from django.contrib import admin +from django.contrib.contenttypes.models import ContentType +from django.core.urlresolvers import reverse +from django.http import HttpRequest +from django.test import TestCase +from django.test.client import Client + +from guardian.admin import GuardedModelAdmin +from guardian.compat import get_user_model +from guardian.compat import str +from guardian.shortcuts import get_perms +from guardian.shortcuts import get_perms_for_model +from guardian.testapp.tests.conf import TEST_SETTINGS +from guardian.testapp.tests.conf import override_settings +from guardian.models import Group +from guardian.testapp.tests.conf import skipUnlessTestApp +from guardian.testapp.models import LogEntryWithGroup as LogEntry + +User = get_user_model() + +class ContentTypeGuardedAdmin(GuardedModelAdmin): + pass + +try: + admin.site.unregister(ContentType) +except admin.sites.NotRegistered: + pass +admin.site.register(ContentType, ContentTypeGuardedAdmin) + +@override_settings(**TEST_SETTINGS) +class AdminTests(TestCase): + + def setUp(self): + self.admin = User.objects.create_superuser('admin', 'admin@example.com', + 'admin') + self.user = User.objects.create_user('joe', 'joe@example.com', 'joe') + self.group = Group.objects.create(name='group') + self.client = Client() + self.obj = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + self.obj_info = self.obj._meta.app_label, self.obj._meta.module_name + + def tearDown(self): + self.client.logout() + + def _login_superuser(self): + self.client.login(username='admin', password='admin') + + def test_view_manage_wrong_obj(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, + kwargs={'object_pk': -10, 'user_id': self.user.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 404) + + def test_view(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context['object'], self.obj) + + def test_view_manage_wrong_user(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, + kwargs={'object_pk': self.obj.pk, 'user_id': -10}) + response = self.client.get(url) + self.assertEqual(response.status_code, 404) + + def test_view_manage_user_form(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'user': self.user.username, 'submit_manage_user': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + redirect_url = reverse('admin:%s_%s_permissions_manage_user' % + self.obj_info, kwargs={'object_pk': self.obj.pk, + 'user_id': self.user.id}) + self.assertEqual(response.request['PATH_INFO'], redirect_url) + + def test_view_manage_negative_user_form(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + self.user = User.objects.create(username='negative_id_user', id=-2010) + data = {'user': self.user.username, 'submit_manage_user': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + redirect_url = reverse('admin:%s_%s_permissions_manage_user' % + self.obj_info, args=[self.obj.pk, self.user.id]) + self.assertEqual(response.request['PATH_INFO'], redirect_url) + + def test_view_manage_user_form_wrong_user(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'user': 'wrong-user', 'submit_manage_user': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('user' in response.context['user_form'].errors) + + def test_view_manage_user_form_wrong_field(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'user': '', 'submit_manage_user': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('user' in response.context['user_form'].errors) + + def test_view_manage_user_form_empty_user(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'user': '', 'submit_manage_user': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('user' in response.context['user_form'].errors) + + def test_view_manage_user_wrong_perms(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, + args=[self.obj.pk, self.user.id]) + perms = ['change_user'] # This is not self.obj related permission + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(response.status_code, 200) + self.assertTrue('permissions' in response.context['form'].errors) + + def test_view_manage_user(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, + args=[self.obj.pk, self.user.id]) + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + choices = set([c[0] for c in + response.context['form'].fields['permissions'].choices]) + self.assertEqual( + set([ p.codename for p in get_perms_for_model(self.obj)]), + choices, + ) + + # Add some perms and check if changes were persisted + perms = ['change_%s' % self.obj_info[1], 'delete_%s' % self.obj_info[1]] + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + + self.assertEqual( + set(get_perms(self.user, self.obj)), + set(perms), + ) + + # Remove perm and check if change was persisted + perms = ['change_%s' % self.obj_info[1]] + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + + self.assertEqual( + set(get_perms(self.user, self.obj)), + set(perms), + ) + + def test_view_manage_group_form(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'group': self.group.name, 'submit_manage_group': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + redirect_url = reverse('admin:%s_%s_permissions_manage_group' % + self.obj_info, args=[self.obj.pk, self.group.id]) + self.assertEqual(response.request['PATH_INFO'], redirect_url) + + def test_view_manage_negative_group_form(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + self.group = Group.objects.create(name='neagive_id_group', id=-2010) + data = {'group': self.group.name, 'submit_manage_group': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + redirect_url = reverse('admin:%s_%s_permissions_manage_group' % + self.obj_info, args=[self.obj.pk, self.group.id]) + self.assertEqual(response.request['PATH_INFO'], redirect_url) + + def test_view_manage_group_form_wrong_group(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'group': 'wrong-group', 'submit_manage_group': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('group' in response.context['group_form'].errors) + + def test_view_manage_group_form_wrong_field(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'group': '', 'submit_manage_group': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('group' in response.context['group_form'].errors) + + def test_view_manage_group_form_empty_group(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions' % self.obj_info, + args=[self.obj.pk]) + data = {'group': '', 'submit_manage_group': 'submit'} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 0) + self.assertEqual(response.status_code, 200) + self.assertTrue('group' in response.context['group_form'].errors) + + def test_view_manage_group_wrong_perms(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_group' % + self.obj_info, args=[self.obj.pk, self.group.id]) + perms = ['change_user'] # This is not self.obj related permission + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(response.status_code, 200) + self.assertTrue('permissions' in response.context['form'].errors) + + def test_view_manage_group(self): + self._login_superuser() + url = reverse('admin:%s_%s_permissions_manage_group' % + self.obj_info, args=[self.obj.pk, self.group.id]) + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + + choices = set([c[0] for c in + response.context['form'].fields['permissions'].choices]) + self.assertEqual( + set([ p.codename for p in get_perms_for_model(self.obj)]), + choices, + ) + + # Add some perms and check if changes were persisted + perms = ['change_%s' % self.obj_info[1], 'delete_%s' % self.obj_info[1]] + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + + self.assertEqual( + set(get_perms(self.group, self.obj)), + set(perms), + ) + + # Remove perm and check if change was persisted + perms = ['delete_%s' % self.obj_info[1]] + data = {'permissions': perms} + response = self.client.post(url, data, follow=True) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.redirect_chain[0][1], 302) + + self.assertEqual( + set(get_perms(self.group, self.obj)), + set(perms), + ) + +if 'django.contrib.admin' not in settings.INSTALLED_APPS: + # Skip admin tests if admin app is not registered + # we simpy clean up AdminTests class ... + # TODO: use @unittest.skipUnless('django.contrib.admin' in settings.INSTALLED_APPS) + # if possible (requires Python 2.7, though) + AdminTests = type('AdminTests', (TestCase,), {}) # pyflakes:ignore + + +@skipUnlessTestApp +class GuardedModelAdminTests(TestCase): + + def _get_gma(self, attrs=None, name=None, model=None): + """ + Returns ``GuardedModelAdmin`` instance. + """ + attrs = attrs or {} + name = str(name or 'GMA') + model = model or User + GMA = type(name, (GuardedModelAdmin,), attrs) + gma = GMA(model, admin.site) + return gma + + def test_obj_perms_manage_template_attr(self): + attrs = {'obj_perms_manage_template': 'foobar.html'} + gma = self._get_gma(attrs=attrs) + self.assertTrue(gma.get_obj_perms_manage_template(), 'foobar.html') + + def test_obj_perms_manage_user_template_attr(self): + attrs = {'obj_perms_manage_user_template': 'foobar.html'} + gma = self._get_gma(attrs=attrs) + self.assertTrue(gma.get_obj_perms_manage_user_template(), 'foobar.html') + + def test_obj_perms_manage_user_form_attr(self): + attrs = {'obj_perms_manage_user_form': forms.Form} + gma = self._get_gma(attrs=attrs) + self.assertTrue(gma.get_obj_perms_manage_user_form(), forms.Form) + + def test_obj_perms_manage_group_template_attr(self): + attrs = {'obj_perms_manage_group_template': 'foobar.html'} + gma = self._get_gma(attrs=attrs) + self.assertTrue(gma.get_obj_perms_manage_group_template(), + 'foobar.html') + + def test_obj_perms_manage_group_form_attr(self): + attrs = {'obj_perms_manage_group_form': forms.Form} + gma = self._get_gma(attrs=attrs) + self.assertTrue(gma.get_obj_perms_manage_group_form(), forms.Form) + + def test_user_can_acces_owned_objects_only(self): + attrs = { + 'user_can_access_owned_objects_only': True, + 'user_owned_objects_field': 'user', + } + gma = self._get_gma(attrs=attrs, model=LogEntry) + joe = User.objects.create_user('joe', 'joe@example.com', 'joe') + jane = User.objects.create_user('jane', 'jane@example.com', 'jane') + ctype = ContentType.objects.get_for_model(User) + joe_entry = LogEntry.objects.create(user=joe, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo') + LogEntry.objects.create(user=jane, content_type=ctype, + object_id=jane.id, action_flag=1, change_message='bar') + request = HttpRequest() + request.user = joe + qs = gma.queryset(request) + self.assertEqual([e.pk for e in qs], [joe_entry.pk]) + + def test_user_can_acces_owned_objects_only_unless_superuser(self): + attrs = { + 'user_can_access_owned_objects_only': True, + 'user_owned_objects_field': 'user', + } + gma = self._get_gma(attrs=attrs, model=LogEntry) + joe = User.objects.create_superuser('joe', 'joe@example.com', 'joe') + jane = User.objects.create_user('jane', 'jane@example.com', 'jane') + ctype = ContentType.objects.get_for_model(User) + joe_entry = LogEntry.objects.create(user=joe, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo') + jane_entry = LogEntry.objects.create(user=jane, content_type=ctype, + object_id=jane.id, action_flag=1, change_message='bar') + request = HttpRequest() + request.user = joe + qs = gma.queryset(request) + self.assertEqual(sorted([e.pk for e in qs]), + sorted([joe_entry.pk, jane_entry.pk])) + + def test_user_can_access_owned_by_group_objects_only(self): + attrs = { + 'user_can_access_owned_by_group_objects_only': True, + 'group_owned_objects_field': 'group', + } + gma = self._get_gma(attrs=attrs, model=LogEntry) + joe = User.objects.create_user('joe', 'joe@example.com', 'joe') + joe_group = Group.objects.create(name='joe-group') + joe.groups.add(joe_group) + jane = User.objects.create_user('jane', 'jane@example.com', 'jane') + jane_group = Group.objects.create(name='jane-group') + jane.groups.add(jane_group) + ctype = ContentType.objects.get_for_model(User) + LogEntry.objects.create(user=joe, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo') + LogEntry.objects.create(user=jane, content_type=ctype, + object_id=jane.id, action_flag=1, change_message='bar') + joe_entry_group = LogEntry.objects.create(user=jane, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo', + group=joe_group) + request = HttpRequest() + request.user = joe + qs = gma.queryset(request) + self.assertEqual([e.pk for e in qs], [joe_entry_group.pk]) + + def test_user_can_access_owned_by_group_objects_only_unless_superuser(self): + attrs = { + 'user_can_access_owned_by_group_objects_only': True, + 'group_owned_objects_field': 'group', + } + gma = self._get_gma(attrs=attrs, model=LogEntry) + joe = User.objects.create_superuser('joe', 'joe@example.com', 'joe') + joe_group = Group.objects.create(name='joe-group') + joe.groups.add(joe_group) + jane = User.objects.create_user('jane', 'jane@example.com', 'jane') + jane_group = Group.objects.create(name='jane-group') + jane.groups.add(jane_group) + ctype = ContentType.objects.get_for_model(User) + LogEntry.objects.create(user=joe, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo') + LogEntry.objects.create(user=jane, content_type=ctype, + object_id=jane.id, action_flag=1, change_message='bar') + LogEntry.objects.create(user=jane, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo', + group=joe_group) + LogEntry.objects.create(user=joe, content_type=ctype, + object_id=joe.id, action_flag=1, change_message='foo', + group=jane_group) + request = HttpRequest() + request.user = joe + qs = gma.queryset(request) + self.assertEqual(sorted(e.pk for e in qs), + sorted(LogEntry.objects.values_list('pk', flat=True))) + + +class GrappelliGuardedModelAdminTests(TestCase): + + org_installed_apps = copy.copy(settings.INSTALLED_APPS) + + def _get_gma(self, attrs=None, name=None, model=None): + """ + Returns ``GuardedModelAdmin`` instance. + """ + attrs = attrs or {} + name = str(name or 'GMA') + model = model or User + GMA = type(name, (GuardedModelAdmin,), attrs) + gma = GMA(model, admin.site) + return gma + + def setUp(self): + settings.INSTALLED_APPS = ['grappelli'] + list(settings.INSTALLED_APPS) + + def tearDown(self): + settings.INSTALLED_APPS = self.org_installed_apps + + def test_get_obj_perms_manage_template(self): + gma = self._get_gma() + self.assertEqual(gma.get_obj_perms_manage_template(), + 'admin/guardian/contrib/grappelli/obj_perms_manage.html') + + def test_get_obj_perms_manage_user_template(self): + gma = self._get_gma() + self.assertEqual(gma.get_obj_perms_manage_user_template(), + 'admin/guardian/contrib/grappelli/obj_perms_manage_user.html') + + def test_get_obj_perms_manage_group_template(self): + gma = self._get_gma() + self.assertEqual(gma.get_obj_perms_manage_group_template(), + 'admin/guardian/contrib/grappelli/obj_perms_manage_group.html') + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/conf.py django-guardian-1.2.0/guardian/testapp/tests/conf.py --- django-guardian-1.1.1/guardian/testapp/tests/conf.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/conf.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,88 @@ +from __future__ import unicode_literals +import os +from guardian.compat import unittest +from guardian.utils import abspath +from django.conf import settings +from django.conf import UserSettingsHolder +from django.utils.functional import wraps + + +THIS = abspath(os.path.dirname(__file__)) +TEST_TEMPLATES_DIR = abspath(THIS, 'templates') + + +TEST_SETTINGS = dict( + TEMPLATE_DIRS=[TEST_TEMPLATES_DIR], +) + + +def skipUnlessTestApp(obj): + app = 'guardian.testapp' + return unittest.skipUnless(app in settings.INSTALLED_APPS, + 'app %r must be installed to run this test' % app)(obj) + + +class TestDataMixin(object): + def setUp(self): + super(TestDataMixin, self).setUp() + from django.contrib.auth.models import Group + try: + from django.contrib.auth import get_user_model + User = get_user_model() + except ImportError: + from django.contrib.auth.models import User + Group.objects.create(pk=1, name='admins') + jack_group = Group.objects.create(pk=2, name='jackGroup') + User.objects.get_or_create(pk=settings.ANONYMOUS_USER_ID) + jack = User.objects.create(pk=1, username='jack', is_active=True, + is_superuser=False, is_staff=False) + jack.groups.add(jack_group) + + +class override_settings(object): + """ + Acts as either a decorator, or a context manager. If it's a decorator it + takes a function and returns a wrapped function. If it's a contextmanager + it's used with the ``with`` statement. In either event entering/exiting + are called before and after, respectively, the function/block is executed. + """ + def __init__(self, **kwargs): + self.options = kwargs + self.wrapped = settings._wrapped + + def __enter__(self): + self.enable() + + def __exit__(self, exc_type, exc_value, traceback): + self.disable() + + def __call__(self, test_func): + from django.test import TransactionTestCase + if isinstance(test_func, type) and issubclass(test_func, TransactionTestCase): + original_pre_setup = test_func._pre_setup + original_post_teardown = test_func._post_teardown + def _pre_setup(innerself): + self.enable() + original_pre_setup(innerself) + def _post_teardown(innerself): + original_post_teardown(innerself) + self.disable() + test_func._pre_setup = _pre_setup + test_func._post_teardown = _post_teardown + return test_func + else: + @wraps(test_func) + def inner(*args, **kwargs): + with self: + return test_func(*args, **kwargs) + return inner + + def enable(self): + override = UserSettingsHolder(settings._wrapped) + for key, new_value in self.options.items(): + setattr(override, key, new_value) + settings._wrapped = override + + def disable(self): + settings._wrapped = self.wrapped + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/conf_test.py django-guardian-1.2.0/guardian/testapp/tests/conf_test.py --- django-guardian-1.1.1/guardian/testapp/tests/conf_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/conf_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,16 @@ +from __future__ import unicode_literals +from django.core.exceptions import ImproperlyConfigured +from django.test import TestCase +from guardian.compat import mock +from guardian.conf import settings as guardian_settings + + +class TestConfiguration(TestCase): + + def test_check_configuration(self): + + with mock.patch('guardian.conf.settings.RENDER_403', True): + with mock.patch('guardian.conf.settings.RAISE_403', True): + self.assertRaises(ImproperlyConfigured, + guardian_settings.check_configuration) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/core_test.py django-guardian-1.2.0/guardian/testapp/tests/core_test.py --- django-guardian-1.1.1/guardian/testapp/tests/core_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/core_test.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,176 @@ +from __future__ import unicode_literals +from itertools import chain + +from django.conf import settings +# Try the new app settings (Django 1.7) and fall back to the old system +try: + from django.apps import apps as django_apps + auth_app = django_apps.get_app_config("auth") +except ImportError: + from django.contrib.auth import models as auth_app +from django.contrib.auth.models import Group, Permission, AnonymousUser +from django.contrib.contenttypes.models import ContentType +from django.test import TestCase + +from guardian.core import ObjectPermissionChecker +from guardian.compat import get_user_model, create_permissions +from guardian.exceptions import NotUserNorGroup +from guardian.models import UserObjectPermission, GroupObjectPermission +from guardian.shortcuts import assign_perm + +User = get_user_model() + +class ObjectPermissionTestCase(TestCase): + + def setUp(self): + self.group, created = Group.objects.get_or_create(name='jackGroup') + self.user, created = User.objects.get_or_create(username='jack') + self.user.groups.add(self.group) + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + try: + self.anonymous_user = User.objects.get(id=settings.ANONYMOUS_USER_ID) + except User.DoesNotExist: + self.anonymous_user = User( + id=settings.ANONYMOUS_USER_ID, + username='AnonymousUser', + ) + self.anonymous_user.save() + + +class ObjectPermissionCheckerTest(ObjectPermissionTestCase): + + def setUp(self): + super(ObjectPermissionCheckerTest, self).setUp() + # Required if MySQL backend is used :/ + create_permissions(auth_app, [], 1) + + def test_cache_for_queries_count(self): + settings.DEBUG = True + try: + from django.db import connection + + ContentType.objects.clear_cache() + checker = ObjectPermissionChecker(self.user) + + # has_perm on Checker should spawn only two queries plus one extra + # for fetching the content type first time we check for specific + # model and two more content types as there are additional checks + # at get_user_obj_perms_model and get_group_obj_perms_model + query_count = len(connection.queries) + res = checker.has_perm("change_group", self.group) + if 'guardian.testapp' in settings.INSTALLED_APPS: + expected = 5 + else: + # TODO: This is strange, need to investigate; totally not sure + # why there are more queries if testapp is not included + expected = 11 + self.assertEqual(len(connection.queries), query_count + expected) + + # Checking again shouldn't spawn any queries + query_count = len(connection.queries) + res_new = checker.has_perm("change_group", self.group) + self.assertEqual(res, res_new) + self.assertEqual(len(connection.queries), query_count) + + # Checking for other permission but for Group object again + # shouldn't spawn any query too + query_count = len(connection.queries) + checker.has_perm("delete_group", self.group) + self.assertEqual(len(connection.queries), query_count) + + # Checking for same model but other instance should spawn 2 queries + new_group = Group.objects.create(name='new-group') + query_count = len(connection.queries) + checker.has_perm("change_group", new_group) + self.assertEqual(len(connection.queries), query_count + 2) + + # Checking for permission for other model should spawn 3 queries + # (again: content type and actual permissions for the object... + query_count = len(connection.queries) + checker.has_perm("change_user", self.user) + self.assertEqual(len(connection.queries), query_count + 3) + + finally: + settings.DEBUG = False + + def test_init(self): + self.assertRaises(NotUserNorGroup, ObjectPermissionChecker, + user_or_group=ContentType()) + self.assertRaises(NotUserNorGroup, ObjectPermissionChecker) + + def test_anonymous_user(self): + user = AnonymousUser() + check = ObjectPermissionChecker(user) + # assert anonymous user has no object permissions at all for obj + self.assertTrue( [] == list(check.get_perms(self.ctype)) ) + + def test_superuser(self): + user = User.objects.create(username='superuser', is_superuser=True) + check = ObjectPermissionChecker(user) + ctype = ContentType.objects.get_for_model(self.ctype) + perms = sorted(chain(*Permission.objects + .filter(content_type=ctype) + .values_list('codename'))) + self.assertEqual(perms, check.get_perms(self.ctype)) + for perm in perms: + self.assertTrue(check.has_perm(perm, self.ctype)) + + def test_not_active_superuser(self): + user = User.objects.create(username='not_active_superuser', + is_superuser=True, is_active=False) + check = ObjectPermissionChecker(user) + ctype = ContentType.objects.get_for_model(self.ctype) + perms = sorted(chain(*Permission.objects + .filter(content_type=ctype) + .values_list('codename'))) + self.assertEqual(check.get_perms(self.ctype), []) + for perm in perms: + self.assertFalse(check.has_perm(perm, self.ctype)) + + def test_not_active_user(self): + user = User.objects.create(username='notactive') + assign_perm("change_contenttype", user, self.ctype) + + # new ObjectPermissionChecker is created for each User.has_perm call + self.assertTrue(user.has_perm("change_contenttype", self.ctype)) + user.is_active = False + self.assertFalse(user.has_perm("change_contenttype", self.ctype)) + + # use on one checker only (as user's is_active attr should be checked + # before try to use cache + user = User.objects.create(username='notactive-cache') + assign_perm("change_contenttype", user, self.ctype) + + check = ObjectPermissionChecker(user) + self.assertTrue(check.has_perm("change_contenttype", self.ctype)) + user.is_active = False + self.assertFalse(check.has_perm("change_contenttype", self.ctype)) + + def test_get_perms(self): + group = Group.objects.create(name='group') + obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + + assign_perms = { + group: ('change_group', 'delete_group'), + obj1: ('change_contenttype', 'delete_contenttype'), + obj2: ('delete_contenttype',), + } + + check = ObjectPermissionChecker(self.user) + + for obj, perms in assign_perms.items(): + for perm in perms: + UserObjectPermission.objects.assign_perm(perm, self.user, obj) + self.assertEqual(sorted(perms), sorted(check.get_perms(obj))) + + check = ObjectPermissionChecker(self.group) + + for obj, perms in assign_perms.items(): + for perm in perms: + GroupObjectPermission.objects.assign_perm(perm, self.group, obj) + self.assertEqual(sorted(perms), sorted(check.get_perms(obj))) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/custompkmodel_test.py django-guardian-1.2.0/guardian/testapp/tests/custompkmodel_test.py --- django-guardian-1.1.1/guardian/testapp/tests/custompkmodel_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/custompkmodel_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,32 @@ +from __future__ import unicode_literals +from django.contrib.contenttypes.models import ContentType +from django.test import TestCase + +from guardian.compat import get_user_model +from guardian.shortcuts import assign_perm, remove_perm + + +class CustomPKModelTest(TestCase): + """ + Tests agains custom model with primary key other than *standard* + ``id`` integer field. + """ + + def setUp(self): + self.user = get_user_model().objects.create(username='joe') + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + + def test_assign_perm(self): + assign_perm('contenttypes.change_contenttype', self.user, self.ctype) + self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + + def test_remove_perm(self): + assign_perm('contenttypes.change_contenttype', self.user, self.ctype) + self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + remove_perm('contenttypes.change_contenttype', self.user, self.ctype) + self.assertFalse(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/decorators_test.py django-guardian-1.2.0/guardian/testapp/tests/decorators_test.py --- django-guardian-1.1.1/guardian/testapp/tests/decorators_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/decorators_test.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,358 @@ +from __future__ import unicode_literals +from django.conf import settings +from django.contrib.auth.models import Group, AnonymousUser +from django.core.exceptions import PermissionDenied +from django.db.models.base import ModelBase +from django.http import HttpRequest +from django.http import HttpResponse +from django.http import HttpResponseForbidden +from django.http import HttpResponseRedirect +from django.shortcuts import get_object_or_404 +from django.template import TemplateDoesNotExist +from django.test import TestCase + +from guardian.compat import get_user_model +from guardian.compat import get_user_model_path +from guardian.compat import get_user_permission_full_codename +from guardian.compat import mock +from guardian.decorators import permission_required, permission_required_or_403 +from guardian.exceptions import GuardianError +from guardian.exceptions import WrongAppError +from guardian.shortcuts import assign_perm +from guardian.testapp.tests.conf import TEST_SETTINGS +from guardian.testapp.tests.conf import TestDataMixin +from guardian.testapp.tests.conf import override_settings +from guardian.testapp.tests.conf import skipUnlessTestApp + +User = get_user_model() +user_model_path = get_user_model_path() + + +@override_settings(**TEST_SETTINGS) +@skipUnlessTestApp +class PermissionRequiredTest(TestDataMixin, TestCase): + + def setUp(self): + super(PermissionRequiredTest, self).setUp() + self.anon = AnonymousUser() + self.user = User.objects.get_or_create(username='jack')[0] + self.group = Group.objects.get_or_create(name='jackGroup')[0] + + def _get_request(self, user=None): + if user is None: + user = AnonymousUser() + request = HttpRequest() + request.user = user + return request + + def test_no_args(self): + + try: + @permission_required + def dummy_view(request): + return HttpResponse('dummy_view') + except GuardianError: + pass + else: + self.fail("Trying to decorate using permission_required without " + "permission as first argument should raise exception") + + def test_RENDER_403_is_false(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + with mock.patch('guardian.conf.settings.RENDER_403', False): + response = dummy_view(request) + self.assertEqual(response.content, b'') + self.assertTrue(isinstance(response, HttpResponseForbidden)) + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_TEMPLATE_403_setting(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + with mock.patch('guardian.conf.settings.TEMPLATE_403', 'dummy403.html'): + response = dummy_view(request) + self.assertEqual(response.content, b'foobar403\n') + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_403_response_is_empty_if_template_cannot_be_found(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + with mock.patch('guardian.conf.settings.TEMPLATE_403', + '_non-exisitng-403.html'): + response = dummy_view(request) + self.assertEqual(response.status_code, 403) + self.assertEqual(response.content, b'') + + @mock.patch('guardian.conf.settings.RENDER_403', True) + def test_403_response_raises_error_if_debug_is_turned_on(self): + org_DEBUG = settings.DEBUG + settings.DEBUG = True + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + with mock.patch('guardian.conf.settings.TEMPLATE_403', + '_non-exisitng-403.html'): + self.assertRaises(TemplateDoesNotExist, dummy_view, request) + settings.DEBUG = org_DEBUG + + @mock.patch('guardian.conf.settings.RENDER_403', False) + @mock.patch('guardian.conf.settings.RAISE_403', True) + def test_RAISE_403_setting_is_true(self): + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + + self.assertRaises(PermissionDenied, dummy_view, request) + + def test_anonymous_user_wrong_app(self): + + request = self._get_request(self.anon) + + @permission_required_or_403('not_installed_app.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + self.assertEqual(dummy_view(request).status_code, 403) + + def test_anonymous_user_wrong_codename(self): + + request = self._get_request() + + @permission_required_or_403('auth.wrong_codename') + def dummy_view(request): + return HttpResponse('dummy_view') + self.assertEqual(dummy_view(request).status_code, 403) + + def test_anonymous_user(self): + + request = self._get_request() + + @permission_required_or_403('auth.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + self.assertEqual(dummy_view(request).status_code, 403) + + def test_wrong_lookup_variables_number(self): + + request = self._get_request() + + try: + @permission_required_or_403('auth.change_user', (User, 'username')) + def dummy_view(request, username): + pass + dummy_view(request, username='jack') + except GuardianError: + pass + else: + self.fail("If lookup variables are passed they must be tuple of: " + "(ModelClass/app_label.ModelClass/queryset, " + ")\n" + "Otherwise GuardianError should be raised") + + def test_wrong_lookup_variables(self): + + request = self._get_request() + + args = ( + (2010, 'username', 'username'), + ('User', 'username', 'username'), + (User, 'username', 'no_arg'), + ) + for tup in args: + try: + @permission_required_or_403('auth.change_user', tup) + def show_user(request, username): + user = get_object_or_404(User, username=username) + return HttpResponse("It's %s here!" % user.username) + show_user(request, 'jack') + except GuardianError: + pass + else: + self.fail("Wrong arguments given but GuardianError not raised") + + def test_user_has_no_access(self): + + request = self._get_request() + + @permission_required_or_403('auth.change_user') + def dummy_view(request): + return HttpResponse('dummy_view') + self.assertEqual(dummy_view(request).status_code, 403) + + def test_user_has_access(self): + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + assign_perm(perm, self.user, obj=joe) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + user_model_path, 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, b'dummy_view') + + def test_user_has_access_on_model_with_metaclass(self): + """ + Test to the fix issues of comparaison made via type() + in the decorator. In the case of a `Model` implementing + a custom metaclass, the decorator fail because type + doesn't return `ModelBase` + """ + perm = get_user_permission_full_codename('change') + + class TestMeta(ModelBase): + pass + + class ProxyUser(User): + class Meta: + proxy = True + app_label = User._meta.app_label + __metaclass__ = TestMeta + + joe, created = ProxyUser.objects.get_or_create(username='joe') + assign_perm(perm, self.user, obj=joe) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + ProxyUser, 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, b'dummy_view') + + def test_user_has_obj_access_even_if_we_also_check_for_global(self): + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + assign_perm(perm, self.user, obj=joe) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + user_model_path, 'username', 'username'), accept_global_perms=True) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, b'dummy_view') + + def test_user_has_no_obj_perm_access(self): + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + user_model_path, 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 403) + + def test_user_has_global_perm_access_but_flag_not_set(self): + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + assign_perm(perm, self.user) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + user_model_path, 'username', 'username')) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 403) + + def test_user_has_global_perm_access(self): + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + assign_perm(perm, self.user) + + request = self._get_request(self.user) + + @permission_required_or_403(perm, ( + user_model_path, 'username', 'username'), accept_global_perms=True) + def dummy_view(request, username): + return HttpResponse('dummy_view') + response = dummy_view(request, username='joe') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, b'dummy_view') + + def test_model_lookup(self): + + request = self._get_request(self.user) + + perm = get_user_permission_full_codename('change') + joe, created = User.objects.get_or_create(username='joe') + assign_perm(perm, self.user, obj=joe) + + models = ( + user_model_path, + User, + User.objects.filter(is_active=True), + ) + for model in models: + @permission_required_or_403(perm, (model, 'username', 'username')) + def dummy_view(request, username): + get_object_or_404(User, username=username) + return HttpResponse('hello') + response = dummy_view(request, username=joe.username) + self.assertEqual(response.content, b'hello') + + def test_redirection_raises_wrong_app_error(self): + from guardian.testapp.models import Project + request = self._get_request(self.user) + + User.objects.create(username='foo') + Project.objects.create(name='foobar') + + @permission_required('auth.change_group', + (Project, 'name', 'group_name'), + login_url='/foobar/') + def dummy_view(request, project_name): + pass + # 'auth.change_group' is wrong permission codename (should be one + # related with User + self.assertRaises(WrongAppError, dummy_view, request, group_name='foobar') + + def test_redirection(self): + from guardian.testapp.models import Project + + request = self._get_request(self.user) + + User.objects.create(username='foo') + Project.objects.create(name='foobar') + + @permission_required('testapp.change_project', + (Project, 'name', 'project_name'), + login_url='/foobar/') + def dummy_view(request, project_name): + pass + response = dummy_view(request, project_name='foobar') + self.assertTrue(isinstance(response, HttpResponseRedirect)) + self.assertTrue(response._headers['location'][1].startswith( + '/foobar/')) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/direct_rel_test.py django-guardian-1.2.0/guardian/testapp/tests/direct_rel_test.py --- django-guardian-1.1.1/guardian/testapp/tests/direct_rel_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/direct_rel_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,199 @@ +from __future__ import unicode_literals +from guardian.testapp.models import Mixed +from guardian.testapp.models import Project +from guardian.testapp.models import ProjectGroupObjectPermission +from guardian.testapp.models import ProjectUserObjectPermission +from django.contrib.auth.models import Group, Permission +from django.test import TestCase +from guardian.compat import get_user_model +from guardian.shortcuts import assign_perm +from guardian.shortcuts import get_groups_with_perms +from guardian.shortcuts import get_objects_for_group +from guardian.shortcuts import get_objects_for_user +from guardian.shortcuts import get_users_with_perms +from guardian.shortcuts import remove_perm +from guardian.testapp.tests.conf import skipUnlessTestApp + + +User = get_user_model() + + +@skipUnlessTestApp +class TestDirectUserPermissions(TestCase): + + def setUp(self): + self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') + self.project = Project.objects.create(name='Foobar') + + def get_perm(self, codename): + filters = {'content_type__app_label': 'testapp', 'codename': codename} + return Permission.objects.get(**filters) + + def test_after_perm_is_created_without_shortcut(self): + perm = self.get_perm('add_project') + # we should not use assign here - if generic user obj perms model is + # used then everything could go fine if using assign shortcut and we + # would not be able to see any problem + ProjectUserObjectPermission.objects.create( + user=self.joe, + permission=perm, + content_object=self.project, + ) + self.assertTrue(self.joe.has_perm('add_project', self.project)) + + def test_assign_perm(self): + assign_perm('add_project', self.joe, self.project) + filters = { + 'content_object': self.project, + 'permission__codename': 'add_project', + 'user': self.joe, + } + result = ProjectUserObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 1) + + def test_remove_perm(self): + assign_perm('add_project', self.joe, self.project) + filters = { + 'content_object': self.project, + 'permission__codename': 'add_project', + 'user': self.joe, + } + result = ProjectUserObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 1) + + remove_perm('add_project', self.joe, self.project) + result = ProjectUserObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 0) + + def test_get_users_with_perms(self): + User.objects.create_user('john', 'john@foobar.com', 'john') + jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') + assign_perm('add_project', self.joe, self.project) + assign_perm('change_project', self.joe, self.project) + assign_perm('change_project', jane, self.project) + self.assertEqual(get_users_with_perms(self.project, attach_perms=True), + { + self.joe: ['add_project', 'change_project'], + jane: ['change_project'], + }) + + def test_get_users_with_perms_plus_groups(self): + User.objects.create_user('john', 'john@foobar.com', 'john') + jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') + group = Group.objects.create(name='devs') + self.joe.groups.add(group) + assign_perm('add_project', self.joe, self.project) + assign_perm('change_project', group, self.project) + assign_perm('change_project', jane, self.project) + self.assertEqual(get_users_with_perms(self.project, attach_perms=True), + { + self.joe: ['add_project', 'change_project'], + jane: ['change_project'], + }) + + def test_get_objects_for_user(self): + foo = Project.objects.create(name='foo') + bar = Project.objects.create(name='bar') + assign_perm('add_project', self.joe, foo) + assign_perm('add_project', self.joe, bar) + assign_perm('change_project', self.joe, bar) + + result = get_objects_for_user(self.joe, 'testapp.add_project') + self.assertEqual(sorted(p.pk for p in result), sorted([foo.pk, bar.pk])) + + +@skipUnlessTestApp +class TestDirectGroupPermissions(TestCase): + + def setUp(self): + self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') + self.group = Group.objects.create(name='admins') + self.joe.groups.add(self.group) + self.project = Project.objects.create(name='Foobar') + + def get_perm(self, codename): + filters = {'content_type__app_label': 'testapp', 'codename': codename} + return Permission.objects.get(**filters) + + def test_after_perm_is_created_without_shortcut(self): + perm = self.get_perm('add_project') + # we should not use assign here - if generic user obj perms model is + # used then everything could go fine if using assign shortcut and we + # would not be able to see any problem + ProjectGroupObjectPermission.objects.create( + group=self.group, + permission=perm, + content_object=self.project, + ) + self.assertTrue(self.joe.has_perm('add_project', self.project)) + + def test_assign_perm(self): + assign_perm('add_project', self.group, self.project) + filters = { + 'content_object': self.project, + 'permission__codename': 'add_project', + 'group': self.group, + } + result = ProjectGroupObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 1) + + def test_remove_perm(self): + assign_perm('add_project', self.group, self.project) + filters = { + 'content_object': self.project, + 'permission__codename': 'add_project', + 'group': self.group, + } + result = ProjectGroupObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 1) + + remove_perm('add_project', self.group, self.project) + result = ProjectGroupObjectPermission.objects.filter(**filters).count() + self.assertEqual(result, 0) + + def test_get_groups_with_perms(self): + Group.objects.create(name='managers') + devs = Group.objects.create(name='devs') + assign_perm('add_project', self.group, self.project) + assign_perm('change_project', self.group, self.project) + assign_perm('change_project', devs, self.project) + self.assertEqual(get_groups_with_perms(self.project, attach_perms=True), + { + self.group: ['add_project', 'change_project'], + devs: ['change_project'], + }) + + def test_get_objects_for_group(self): + foo = Project.objects.create(name='foo') + bar = Project.objects.create(name='bar') + assign_perm('add_project', self.group, foo) + assign_perm('add_project', self.group, bar) + assign_perm('change_project', self.group, bar) + + result = get_objects_for_group(self.group, 'testapp.add_project') + self.assertEqual(sorted(p.pk for p in result), sorted([foo.pk, bar.pk])) + + +@skipUnlessTestApp +class TestMixedDirectAndGenericObjectPermission(TestCase): + + def setUp(self): + self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') + self.group = Group.objects.create(name='admins') + self.joe.groups.add(self.group) + self.mixed = Mixed.objects.create(name='Foobar') + + def test_get_users_with_perms_plus_groups(self): + User.objects.create_user('john', 'john@foobar.com', 'john') + jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') + group = Group.objects.create(name='devs') + self.joe.groups.add(group) + assign_perm('add_mixed', self.joe, self.mixed) + assign_perm('change_mixed', group, self.mixed) + assign_perm('change_mixed', jane, self.mixed) + self.assertEqual(get_users_with_perms(self.mixed, attach_perms=True), + { + self.joe: ['add_mixed', 'change_mixed'], + jane: ['change_mixed'], + }) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/forms_test.py django-guardian-1.2.0/guardian/testapp/tests/forms_test.py --- django-guardian-1.1.1/guardian/testapp/tests/forms_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/forms_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,31 @@ +from __future__ import unicode_literals + +from django.contrib.contenttypes.models import ContentType +from django.test import TestCase +from guardian.compat import get_user_model +from guardian.forms import BaseObjectPermissionsForm + +class BaseObjectPermissionsFormTests(TestCase): + + def setUp(self): + self.user = get_user_model().objects.create_user( + 'joe', 'joe@example.com', 'joe') + self.obj = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + + def test_not_implemented(self): + + class MyUserObjectPermissionsForm(BaseObjectPermissionsForm): + + def __init__(formself, user, *args, **kwargs): + self.user = user + super(MyUserObjectPermissionsForm, formself).__init__(*args, + **kwargs) + + form = MyUserObjectPermissionsForm(self.user, self.obj, {}) + self.assertRaises(NotImplementedError, form.save_obj_perms) + + field_name = form.get_obj_perms_field_name() + self.assertTrue(form.is_valid()) + self.assertEqual(len(form.cleaned_data[field_name]), 0) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/__init__.py django-guardian-1.2.0/guardian/testapp/tests/__init__.py --- django-guardian-1.1.1/guardian/testapp/tests/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/__init__.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,24 @@ +from __future__ import unicode_literals +import django +from django.conf import settings + +from .conf_test import * +from .core_test import * +from .custompkmodel_test import * +from .decorators_test import * +from .direct_rel_test import * +from .forms_test import * +from .managers_test import * +from .management_test import * +from .orphans_test import * +from .other_test import * +from .utils_test import * +from .shortcuts_test import * +from .tags_test import * + + +if 'django.contrib.admin' in settings.INSTALLED_APPS: + from .admin_test import * +if django.VERSION >= (1, 3): + from .mixins_test import * + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/management_test.py django-guardian-1.2.0/guardian/testapp/tests/management_test.py --- django-guardian-1.1.1/guardian/testapp/tests/management_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/management_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,31 @@ +from __future__ import absolute_import +from __future__ import unicode_literals + +from guardian.compat import get_user_model +from guardian.compat import mock +from guardian.compat import unittest +from guardian.management import create_anonymous_user +import django + + +mocked_get_init_anon = mock.Mock() + + +class TestGetAnonymousUser(unittest.TestCase): + + @unittest.skipUnless(django.VERSION >= (1, 5), "Django >= 1.5 only") + @mock.patch('guardian.management.guardian_settings') + def test_uses_custom_function(self, guardian_settings): + path = 'guardian.testapp.tests.management_test.mocked_get_init_anon' + guardian_settings.GET_INIT_ANONYMOUS_USER = path + guardian_settings.ANONYMOUS_USER_ID = 219 + User = get_user_model() + + anon = mocked_get_init_anon.return_value = mock.Mock() + + create_anonymous_user('sender') + + mocked_get_init_anon.assert_called_once_with(User) + + self.assertEqual(anon.pk, 219) + anon.save.assert_called_once_with() diff -Nru django-guardian-1.1.1/guardian/testapp/tests/managers_test.py django-guardian-1.2.0/guardian/testapp/tests/managers_test.py --- django-guardian-1.1.1/guardian/testapp/tests/managers_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/managers_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,21 @@ +from __future__ import unicode_literals +from django.test import TestCase +from guardian.compat import mock +from guardian.managers import UserObjectPermissionManager +from guardian.managers import GroupObjectPermissionManager + + +class TestManagers(TestCase): + + def test_user_manager_assign(self): + manager = UserObjectPermissionManager() + manager.assign_perm = mock.Mock() + manager.assign('perm', 'user', 'object') + manager.assign_perm.assert_called_once_with('perm', 'user', 'object') + + def test_group_manager_assign(self): + manager = GroupObjectPermissionManager() + manager.assign_perm = mock.Mock() + manager.assign('perm', 'group', 'object') + manager.assign_perm.assert_called_once_with('perm', 'group', 'object') + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/mixins_test.py django-guardian-1.2.0/guardian/testapp/tests/mixins_test.py --- django-guardian-1.1.1/guardian/testapp/tests/mixins_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/mixins_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,157 @@ +from __future__ import unicode_literals + +from django.contrib.contenttypes.models import ContentType +from django.contrib.auth.models import AnonymousUser +from django.core.exceptions import ImproperlyConfigured +from django.core.exceptions import PermissionDenied +from django.http import HttpResponse +from django.test import TestCase +from django.test.client import RequestFactory +from django.views.generic import View + +from guardian.compat import get_user_model +from guardian.compat import mock +from guardian.mixins import LoginRequiredMixin +from guardian.mixins import PermissionRequiredMixin + +class DatabaseRemovedError(Exception): + pass + + +class RemoveDatabaseView(View): + def get(self, request, *args, **kwargs): + raise DatabaseRemovedError("You've just allowed db to be removed!") + +class TestView(PermissionRequiredMixin, RemoveDatabaseView): + permission_required = 'contenttypes.change_contenttype' + object = None # should be set at each tests explicitly + +class NoObjectView(PermissionRequiredMixin, RemoveDatabaseView): + permission_required = 'contenttypes.change_contenttype' + +class TestViewMixins(TestCase): + + def setUp(self): + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + self.factory = RequestFactory() + self.user = get_user_model().objects.create_user( + 'joe', 'joe@doe.com', 'doe') + self.client.login(username='joe', password='doe') + + def test_permission_is_checked_before_view_is_computed(self): + """ + This test would fail if permission is checked **after** view is + actually resolved. + """ + request = self.factory.get('/') + request.user = self.user + # View.object is set + view = TestView.as_view(object=self.ctype) + response = view(request) + self.assertEqual(response.status_code, 302) + + # View.get_object returns object + TestView.get_object = lambda instance: self.ctype + view = TestView.as_view() + response = view(request) + self.assertEqual(response.status_code, 302) + del TestView.get_object + + def test_permission_is_checked_before_view_is_computed_perm_denied_raised(self): + """ + This test would fail if permission is checked **after** view is + actually resolved. + """ + request = self.factory.get('/') + request.user = self.user + view = TestView.as_view(raise_exception=True, object=self.ctype) + with self.assertRaises(PermissionDenied): + view(request) + + def test_permission_required_view_configured_wrongly(self): + """ + This test would fail if permission is checked **after** view is + actually resolved. + """ + request = self.factory.get('/') + request.user = self.user + request.user.add_obj_perm('change_contenttype', self.ctype) + view = TestView.as_view(permission_required=None, object=self.ctype) + with self.assertRaises(ImproperlyConfigured): + view(request) + + def test_permission_required(self): + """ + This test would fail if permission is checked **after** view is + actually resolved. + """ + request = self.factory.get('/') + request.user = self.user + request.user.add_obj_perm('change_contenttype', self.ctype) + view = TestView.as_view(object=self.ctype) + with self.assertRaises(DatabaseRemovedError): + view(request) + + def test_permission_required_no_object(self): + """ + This test would fail if permission is checked on a view's + object when it has none + """ + + request = self.factory.get('/') + request.user = self.user + request.user.add_obj_perm('change_contenttype', self.ctype) + view = NoObjectView.as_view() + response = view(request) + self.assertEqual(response.status_code, 302) + + def test_permission_required_as_list(self): + """ + This test would fail if permission is checked **after** view is + actually resolved. + """ + + global TestView + class SecretView(TestView): + on_permission_check_fail = mock.Mock() + + request = self.factory.get('/') + request.user = self.user + request.user.add_obj_perm('change_contenttype', self.ctype) + SecretView.permission_required = ['contenttypes.change_contenttype', + 'contenttypes.add_contenttype'] + view = SecretView.as_view(object=self.ctype) + response = view(request) + self.assertEqual(response.status_code, 302) + SecretView.on_permission_check_fail.assert_called_once_with(request, + response, obj=self.ctype) + + request.user.add_obj_perm('add_contenttype', self.ctype) + with self.assertRaises(DatabaseRemovedError): + view(request) + + def test_login_required_mixin(self): + + class SecretView(LoginRequiredMixin, View): + redirect_field_name = 'foobar' + login_url = '/let-me-in/' + + def get(self, request): + return HttpResponse('secret-view') + + request = self.factory.get('/some-secret-page/') + request.user = AnonymousUser() + + view = SecretView.as_view() + + response = view(request) + self.assertEqual(response.status_code, 302) + self.assertEqual(response['Location'], + '/let-me-in/?foobar=/some-secret-page/') + + request.user = self.user + response = view(request) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, b'secret-view') + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/orphans_test.py django-guardian-1.2.0/guardian/testapp/tests/orphans_test.py --- django-guardian-1.1.1/guardian/testapp/tests/orphans_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/orphans_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,102 @@ +from __future__ import unicode_literals + +# Try the new app settings (Django 1.7) and fall back to the old system +try: + from django.apps import apps as django_apps + auth_app = django_apps.get_app_config("auth") +except ImportError: + from django.contrib.auth import models as auth_app +from django.contrib.contenttypes.models import ContentType +from django.core.management import call_command +from django.test import TestCase + +from guardian.compat import get_user_model, create_permissions +from guardian.utils import clean_orphan_obj_perms +from guardian.shortcuts import assign_perm +from guardian.models import Group +from guardian.testapp.tests.conf import skipUnlessTestApp + + +User = get_user_model() +user_module_name = User._meta.module_name + +@skipUnlessTestApp +class OrphanedObjectPermissionsTest(TestCase): + + def setUp(self): + # Create objects for which we would assing obj perms + self.target_user1 = User.objects.create(username='user1') + self.target_group1 = Group.objects.create(name='group1') + self.target_obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='fake-for-guardian-tests') + self.target_obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='fake-for-guardian-tests') + # Required if MySQL backend is used :/ + create_permissions(auth_app, [], 1) + + + self.user = User.objects.create(username='user') + self.group = Group.objects.create(name='group') + + def test_clean_perms(self): + + # assign obj perms + target_perms = { + self.target_user1: ["change_%s" % user_module_name], + self.target_group1: ["delete_group"], + self.target_obj1: ["change_contenttype", "delete_contenttype"], + self.target_obj2: ["change_contenttype"], + } + obj_perms_count = sum([len(val) for key, val in target_perms.items()]) + for target, perms in target_perms.items(): + target.__old_pk = target.pk # Store pkeys + for perm in perms: + assign_perm(perm, self.user, target) + + # Remove targets + for target, perms in target_perms.items(): + target.delete() + + # Clean orphans + removed = clean_orphan_obj_perms() + self.assertEqual(removed, obj_perms_count) + + # Recreate targets and check if user has no permissions + for target, perms in target_perms.items(): + target.pk = target.__old_pk + target.save() + for perm in perms: + self.assertFalse(self.user.has_perm(perm, target)) + + def test_clean_perms_command(self): + """ + Same test as the one above but rather function directly, we call + management command instead. + """ + + # assign obj perms + target_perms = { + self.target_user1: ["change_%s" % user_module_name], + self.target_group1: ["delete_group"], + self.target_obj1: ["change_contenttype", "delete_contenttype"], + self.target_obj2: ["change_contenttype"], + } + for target, perms in target_perms.items(): + target.__old_pk = target.pk # Store pkeys + for perm in perms: + assign_perm(perm, self.user, target) + + # Remove targets + for target, perms in target_perms.items(): + target.delete() + + # Clean orphans + call_command("clean_orphan_obj_perms", verbosity=0) + + # Recreate targets and check if user has no permissions + for target, perms in target_perms.items(): + target.pk = target.__old_pk + target.save() + for perm in perms: + self.assertFalse(self.user.has_perm(perm, target)) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/other_test.py django-guardian-1.2.0/guardian/testapp/tests/other_test.py --- django-guardian-1.1.1/guardian/testapp/tests/other_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/other_test.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,276 @@ +from __future__ import unicode_literals + +from django.contrib.auth.models import AnonymousUser +from django.contrib.auth.models import Group +from django.contrib.auth.models import Permission +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ValidationError +from django.test import TestCase + +import guardian +from guardian.backends import ObjectPermissionBackend +from guardian.compat import get_user_model +from guardian.compat import get_user_model_path +from guardian.compat import get_user_permission_codename +from guardian.compat import basestring +from guardian.compat import unicode +from guardian.exceptions import GuardianError +from guardian.exceptions import NotUserNorGroup +from guardian.exceptions import ObjectNotPersisted +from guardian.exceptions import WrongAppError +from guardian.models import GroupObjectPermission +from guardian.models import UserObjectPermission +from guardian.testapp.tests.conf import TestDataMixin + +User = get_user_model() +user_model_path = get_user_model_path() + + +class UserPermissionTests(TestDataMixin, TestCase): + + def setUp(self): + super(UserPermissionTests, self).setUp() + self.user = User.objects.get(username='jack') + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + self.obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + self.obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + + def test_assignement(self): + self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) + + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, + self.ctype) + self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) + self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + + def test_assignement_and_remove(self): + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, + self.ctype) + self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) + + UserObjectPermission.objects.remove_perm('change_contenttype', + self.user, self.ctype) + self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) + + def test_ctypes(self): + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj1) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) + + UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj1) + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj2) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) + + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj1) + UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj2) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) + + UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj1) + UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj2) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) + + def test_assign_perm_validation(self): + self.assertRaises(Permission.DoesNotExist, + UserObjectPermission.objects.assign_perm, 'change_group', self.user, + self.user) + + group = Group.objects.create(name='test_group_assign_perm_validation') + ctype = ContentType.objects.get_for_model(group) + codename = codename=get_user_permission_codename('change') + perm = Permission.objects.get(codename=codename) + + create_info = dict( + permission = perm, + user = self.user, + content_type = ctype, + object_pk = group.pk + ) + self.assertRaises(ValidationError, UserObjectPermission.objects.create, + **create_info) + + def test_unicode(self): + codename = get_user_permission_codename('change') + obj_perm = UserObjectPermission.objects.assign_perm(codename, + self.user, self.user) + self.assertTrue(isinstance(obj_perm.__unicode__(), unicode)) + + def test_errors(self): + not_saved_user = User(username='not_saved_user') + codename = get_user_permission_codename('change') + self.assertRaises(ObjectNotPersisted, + UserObjectPermission.objects.assign_perm, + codename, self.user, not_saved_user) + self.assertRaises(ObjectNotPersisted, + UserObjectPermission.objects.remove_perm, + codename, self.user, not_saved_user) + + +class GroupPermissionTests(TestDataMixin, TestCase): + + def setUp(self): + super(GroupPermissionTests, self).setUp() + self.user = User.objects.get(username='jack') + self.group, created = Group.objects.get_or_create(name='jackGroup') + self.user.groups.add(self.group) + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + self.obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + self.obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + + def test_assignement(self): + self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) + self.assertFalse(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.ctype) + self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) + self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', + self.ctype)) + + def test_assignement_and_remove(self): + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.ctype) + self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) + + GroupObjectPermission.objects.remove_perm('change_contenttype', + self.group, self.ctype) + self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) + + def test_ctypes(self): + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.obj1) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) + + GroupObjectPermission.objects.remove_perm('change_contenttype', + self.group, self.obj1) + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.obj2) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) + + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.obj1) + GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, + self.obj2) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) + self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) + + GroupObjectPermission.objects.remove_perm('change_contenttype', + self.group, self.obj1) + GroupObjectPermission.objects.remove_perm('change_contenttype', + self.group, self.obj2) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) + self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) + + def test_assign_perm_validation(self): + self.assertRaises(Permission.DoesNotExist, + GroupObjectPermission.objects.assign_perm, 'change_user', self.group, + self.group) + + user = User.objects.create(username='testuser') + ctype = ContentType.objects.get_for_model(user) + perm = Permission.objects.get(codename='change_group') + + create_info = dict( + permission = perm, + group = self.group, + content_type = ctype, + object_pk = user.pk + ) + self.assertRaises(ValidationError, GroupObjectPermission.objects.create, + **create_info) + + def test_unicode(self): + obj_perm = GroupObjectPermission.objects.assign_perm("change_group", + self.group, self.group) + self.assertTrue(isinstance(obj_perm.__unicode__(), unicode)) + + def test_errors(self): + not_saved_group = Group(name='not_saved_group') + self.assertRaises(ObjectNotPersisted, + GroupObjectPermission.objects.assign_perm, + "change_group", self.group, not_saved_group) + self.assertRaises(ObjectNotPersisted, + GroupObjectPermission.objects.remove_perm, + "change_group", self.group, not_saved_group) + + +class ObjectPermissionBackendTests(TestCase): + + def setUp(self): + self.user = User.objects.create(username='jack') + self.backend = ObjectPermissionBackend() + + def test_attrs(self): + self.assertTrue(self.backend.supports_anonymous_user) + self.assertTrue(self.backend.supports_object_permissions) + self.assertTrue(self.backend.supports_inactive_user) + + def test_authenticate(self): + self.assertEqual(self.backend.authenticate( + self.user.username, self.user.password), None) + + def test_has_perm_noobj(self): + result = self.backend.has_perm(self.user, "change_contenttype") + self.assertFalse(result) + + def test_has_perm_notauthed(self): + user = AnonymousUser() + self.assertFalse(self.backend.has_perm(user, "change_user", self.user)) + + def test_has_perm_wrong_app(self): + self.assertRaises(WrongAppError, self.backend.has_perm, + self.user, "no_app.change_user", self.user) + + def test_obj_is_not_model(self): + for obj in (Group, 666, "String", [2, 1, 5, 7], {}): + self.assertFalse(self.backend.has_perm(self.user, + "any perm", obj)) + + def test_not_active_user(self): + user = User.objects.create(username='non active user') + ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + perm = 'change_contenttype' + UserObjectPermission.objects.assign_perm(perm, user, ctype) + self.assertTrue(self.backend.has_perm(user, perm, ctype)) + user.is_active = False + user.save() + self.assertFalse(self.backend.has_perm(user, perm, ctype)) + + +class GuardianBaseTests(TestCase): + + def has_attrs(self): + self.assertTrue(hasattr(guardian, '__version__')) + + def test_version(self): + for x in guardian.VERSION: + self.assertTrue(isinstance(x, (int, basestring))) + + def test_get_version(self): + self.assertTrue(isinstance(guardian.get_version(), basestring)) + + +class TestExceptions(TestCase): + + def _test_error_class(self, exc_cls): + self.assertTrue(isinstance(exc_cls, GuardianError)) + + def test_error_classes(self): + self.assertTrue(isinstance(GuardianError(), Exception)) + guardian_errors = [NotUserNorGroup] + for err in guardian_errors: + self._test_error_class(err()) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/shortcuts_test.py django-guardian-1.2.0/guardian/testapp/tests/shortcuts_test.py --- django-guardian-1.1.1/guardian/testapp/tests/shortcuts_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/shortcuts_test.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,725 @@ +from __future__ import unicode_literals + +from django.contrib.auth.models import AnonymousUser +from django.contrib.contenttypes.models import ContentType +from django.db.models.query import QuerySet +from django.test import TestCase + +from guardian.shortcuts import get_perms_for_model +from guardian.core import ObjectPermissionChecker +from guardian.compat import get_user_model +from guardian.compat import get_user_permission_full_codename +from guardian.shortcuts import assign +from guardian.shortcuts import assign_perm +from guardian.shortcuts import remove_perm +from guardian.shortcuts import get_perms +from guardian.shortcuts import get_users_with_perms +from guardian.shortcuts import get_groups_with_perms +from guardian.shortcuts import get_objects_for_user +from guardian.shortcuts import get_objects_for_group +from guardian.exceptions import MixedContentTypeError +from guardian.exceptions import NotUserNorGroup +from guardian.exceptions import WrongAppError +from guardian.testapp.tests.core_test import ObjectPermissionTestCase +from guardian.models import Group, Permission + +import warnings + + +User = get_user_model() +user_app_label = User._meta.app_label +user_module_name = User._meta.module_name + +class ShortcutsTests(ObjectPermissionTestCase): + + def test_get_perms_for_model(self): + self.assertEqual(get_perms_for_model(self.user).count(), 3) + self.assertTrue(list(get_perms_for_model(self.user)) == + list(get_perms_for_model(User))) + self.assertEqual(get_perms_for_model(Permission).count(), 3) + + model_str = 'contenttypes.ContentType' + self.assertEqual( + sorted(get_perms_for_model(model_str).values_list()), + sorted(get_perms_for_model(ContentType).values_list())) + obj = ContentType() + self.assertEqual( + sorted(get_perms_for_model(model_str).values_list()), + sorted(get_perms_for_model(obj).values_list())) + +class AssignPermTest(ObjectPermissionTestCase): + """ + Tests permission assigning for user/group and object. + """ + def test_not_model(self): + self.assertRaises(NotUserNorGroup, assign_perm, + perm="change_object", + user_or_group="Not a Model", + obj=self.ctype) + + def test_global_wrong_perm(self): + self.assertRaises(ValueError, assign_perm, + perm="change_site", # for global permissions must provide app_label + user_or_group=self.user) + + def test_user_assign_perm(self): + assign_perm("change_contenttype", self.user, self.ctype) + assign_perm("change_contenttype", self.group, self.ctype) + self.assertTrue(self.user.has_perm("change_contenttype", self.ctype)) + + def test_group_assign_perm(self): + assign_perm("change_contenttype", self.group, self.ctype) + assign_perm("delete_contenttype", self.group, self.ctype) + + check = ObjectPermissionChecker(self.group) + self.assertTrue(check.has_perm("change_contenttype", self.ctype)) + self.assertTrue(check.has_perm("delete_contenttype", self.ctype)) + + def test_user_assign_perm_global(self): + perm = assign_perm("contenttypes.change_contenttype", self.user) + self.assertTrue(self.user.has_perm("contenttypes.change_contenttype")) + self.assertTrue(isinstance(perm, Permission)) + + def test_group_assign_perm_global(self): + perm = assign_perm("contenttypes.change_contenttype", self.group) + + self.assertTrue(self.user.has_perm("contenttypes.change_contenttype")) + self.assertTrue(isinstance(perm, Permission)) + + def test_deprecation_warning(self): + with warnings.catch_warnings(record=True) as warns: + warnings.simplefilter('always') + assign("contenttypes.change_contenttype", self.group) + self.assertEqual(len(warns), 1) + self.assertTrue(isinstance(warns[0].message, DeprecationWarning)) + + +class RemovePermTest(ObjectPermissionTestCase): + """ + Tests object permissions removal. + """ + def test_not_model(self): + self.assertRaises(NotUserNorGroup, remove_perm, + perm="change_object", + user_or_group="Not a Model", + obj=self.ctype) + + def test_global_wrong_perm(self): + self.assertRaises(ValueError, remove_perm, + perm="change_site", # for global permissions must provide app_label + user_or_group=self.user) + + def test_user_remove_perm(self): + # assign perm first + assign_perm("change_contenttype", self.user, self.ctype) + remove_perm("change_contenttype", self.user, self.ctype) + self.assertFalse(self.user.has_perm("change_contenttype", self.ctype)) + + def test_group_remove_perm(self): + # assign perm first + assign_perm("change_contenttype", self.group, self.ctype) + remove_perm("change_contenttype", self.group, self.ctype) + + check = ObjectPermissionChecker(self.group) + self.assertFalse(check.has_perm("change_contenttype", self.ctype)) + + def test_user_remove_perm_global(self): + # assign perm first + perm = "contenttypes.change_contenttype" + assign_perm(perm, self.user) + remove_perm(perm, self.user) + self.assertFalse(self.user.has_perm(perm)) + + def test_group_remove_perm_global(self): + # assign perm first + perm = "contenttypes.change_contenttype" + assign_perm(perm, self.group) + remove_perm(perm, self.group) + app_label, codename = perm.split('.') + perm_obj = Permission.objects.get(codename=codename, + content_type__app_label=app_label) + self.assertFalse(perm_obj in self.group.permissions.all()) + + +class GetPermsTest(ObjectPermissionTestCase): + """ + Tests get_perms function (already done at core tests but left here as a + placeholder). + """ + def test_not_model(self): + self.assertRaises(NotUserNorGroup, get_perms, + user_or_group=None, + obj=self.ctype) + + def test_user(self): + perms_to_assign = ("change_contenttype",) + + for perm in perms_to_assign: + assign_perm("change_contenttype", self.user, self.ctype) + + perms = get_perms(self.user, self.ctype) + for perm in perms_to_assign: + self.assertTrue(perm in perms) + +class GetUsersWithPermsTest(TestCase): + """ + Tests get_users_with_perms function. + """ + def setUp(self): + self.obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + self.obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + self.user1 = User.objects.create(username='user1') + self.user2 = User.objects.create(username='user2') + self.user3 = User.objects.create(username='user3') + self.group1 = Group.objects.create(name='group1') + self.group2 = Group.objects.create(name='group2') + self.group3 = Group.objects.create(name='group3') + + def test_empty(self): + result = get_users_with_perms(self.obj1) + self.assertTrue(isinstance(result, QuerySet)) + self.assertEqual(list(result), []) + + result = get_users_with_perms(self.obj1, attach_perms=True) + self.assertTrue(isinstance(result, dict)) + self.assertFalse(bool(result)) + + def test_simple(self): + assign_perm("change_contenttype", self.user1, self.obj1) + assign_perm("delete_contenttype", self.user2, self.obj1) + assign_perm("delete_contenttype", self.user3, self.obj2) + + result = get_users_with_perms(self.obj1) + result_vals = result.values_list('username', flat=True) + + self.assertEqual( + set(result_vals), + set([user.username for user in (self.user1, self.user2)]), + ) + + def test_users_groups_perms(self): + self.user1.groups.add(self.group1) + self.user2.groups.add(self.group2) + self.user3.groups.add(self.group3) + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.group2, self.obj1) + assign_perm("delete_contenttype", self.group3, self.obj2) + + result = get_users_with_perms(self.obj1).values_list('id', + flat=True) + self.assertEqual( + set(result), + set([u.id for u in (self.user1, self.user2)]) + ) + + def test_users_groups_after_removal(self): + self.test_users_groups_perms() + remove_perm("change_contenttype", self.group1, self.obj1) + + result = get_users_with_perms(self.obj1).values_list('id', + flat=True) + self.assertEqual( + set(result), + set([self.user2.id]), + ) + + def test_attach_perms(self): + self.user1.groups.add(self.group1) + self.user2.groups.add(self.group2) + self.user3.groups.add(self.group3) + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.group2, self.obj1) + assign_perm("delete_contenttype", self.group3, self.obj2) + assign_perm("delete_contenttype", self.user2, self.obj1) + assign_perm("change_contenttype", self.user3, self.obj2) + + # Check contenttype1 + result = get_users_with_perms(self.obj1, attach_perms=True) + expected = { + self.user1: ["change_contenttype"], + self.user2: ["change_contenttype", "delete_contenttype"], + } + self.assertEqual(result.keys(), expected.keys()) + for key, perms in result.items(): + self.assertEqual(set(perms), set(expected[key])) + + # Check contenttype2 + result = get_users_with_perms(self.obj2, attach_perms=True) + expected = { + self.user3: ["change_contenttype", "delete_contenttype"], + } + self.assertEqual(result.keys(), expected.keys()) + for key, perms in result.items(): + self.assertEqual(set(perms), set(expected[key])) + + def test_attach_groups_only_has_perms(self): + self.user1.groups.add(self.group1) + assign_perm("change_contenttype", self.group1, self.obj1) + result = get_users_with_perms(self.obj1, attach_perms=True) + expected = {self.user1: ["change_contenttype"]} + self.assertEqual(result, expected) + + def test_mixed(self): + self.user1.groups.add(self.group1) + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.user2, self.obj1) + assign_perm("delete_contenttype", self.user2, self.obj1) + assign_perm("delete_contenttype", self.user2, self.obj2) + assign_perm("change_contenttype", self.user3, self.obj2) + assign_perm("change_%s" % user_module_name, self.user3, self.user1) + + result = get_users_with_perms(self.obj1) + self.assertEqual( + set(result), + set([self.user1, self.user2]), + ) + + def test_with_superusers(self): + admin = User.objects.create(username='admin', is_superuser=True) + assign_perm("change_contenttype", self.user1, self.obj1) + + result = get_users_with_perms(self.obj1, with_superusers=True) + self.assertEqual( + set(result), + set([self.user1, admin]), + ) + + def test_without_group_users(self): + self.user1.groups.add(self.group1) + self.user2.groups.add(self.group2) + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.user2, self.obj1) + assign_perm("change_contenttype", self.group2, self.obj1) + result = get_users_with_perms(self.obj1, with_group_users=False) + expected = set([self.user2]) + self.assertEqual(set(result), expected) + + def test_without_group_users_but_perms_attached(self): + self.user1.groups.add(self.group1) + self.user2.groups.add(self.group2) + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.user2, self.obj1) + assign_perm("change_contenttype", self.group2, self.obj1) + result = get_users_with_perms(self.obj1, with_group_users=False, + attach_perms=True) + expected = {self.user2: ["change_contenttype"]} + self.assertEqual(result, expected) + + def test_without_group_users_no_result(self): + self.user1.groups.add(self.group1) + assign_perm("change_contenttype", self.group1, self.obj1) + result = get_users_with_perms(self.obj1, attach_perms=True, + with_group_users=False) + expected = {} + self.assertEqual(result, expected) + + def test_without_group_users_no_result_but_with_superusers(self): + admin = User.objects.create(username='admin', is_superuser=True) + self.user1.groups.add(self.group1) + assign_perm("change_contenttype", self.group1, self.obj1) + result = get_users_with_perms(self.obj1, with_group_users=False, + with_superusers=True) + expected = [admin] + self.assertEqual(set(result), set(expected)) + + +class GetGroupsWithPerms(TestCase): + """ + Tests get_groups_with_perms function. + """ + def setUp(self): + self.obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + self.obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + self.user1 = User.objects.create(username='user1') + self.user2 = User.objects.create(username='user2') + self.user3 = User.objects.create(username='user3') + self.group1 = Group.objects.create(name='group1') + self.group2 = Group.objects.create(name='group2') + self.group3 = Group.objects.create(name='group3') + + def test_empty(self): + result = get_groups_with_perms(self.obj1) + self.assertTrue(isinstance(result, QuerySet)) + self.assertFalse(bool(result)) + + result = get_groups_with_perms(self.obj1, attach_perms=True) + self.assertTrue(isinstance(result, dict)) + self.assertFalse(bool(result)) + + def test_simple(self): + assign_perm("change_contenttype", self.group1, self.obj1) + result = get_groups_with_perms(self.obj1) + self.assertEqual(len(result), 1) + self.assertEqual(result[0], self.group1) + + def test_simple_after_removal(self): + self.test_simple() + remove_perm("change_contenttype", self.group1, self.obj1) + result = get_groups_with_perms(self.obj1) + self.assertEqual(len(result), 0) + + def test_simple_attach_perms(self): + assign_perm("change_contenttype", self.group1, self.obj1) + result = get_groups_with_perms(self.obj1, attach_perms=True) + expected = {self.group1: ["change_contenttype"]} + self.assertEqual(result, expected) + + def test_simple_attach_perms_after_removal(self): + self.test_simple_attach_perms() + remove_perm("change_contenttype", self.group1, self.obj1) + result = get_groups_with_perms(self.obj1, attach_perms=True) + self.assertEqual(len(result), 0) + + def test_mixed(self): + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.group1, self.obj2) + assign_perm("change_%s" % user_module_name, self.group1, self.user3) + assign_perm("change_contenttype", self.group2, self.obj2) + assign_perm("change_contenttype", self.group2, self.obj1) + assign_perm("delete_contenttype", self.group2, self.obj1) + assign_perm("change_%s" % user_module_name, self.group3, self.user1) + + result = get_groups_with_perms(self.obj1) + self.assertEqual(set(result), set([self.group1, self.group2])) + + def test_mixed_attach_perms(self): + assign_perm("change_contenttype", self.group1, self.obj1) + assign_perm("change_contenttype", self.group1, self.obj2) + assign_perm("change_group", self.group1, self.group3) + assign_perm("change_contenttype", self.group2, self.obj2) + assign_perm("change_contenttype", self.group2, self.obj1) + assign_perm("delete_contenttype", self.group2, self.obj1) + assign_perm("change_group", self.group3, self.group1) + + result = get_groups_with_perms(self.obj1, attach_perms=True) + expected = { + self.group1: ["change_contenttype"], + self.group2: ["change_contenttype", "delete_contenttype"], + } + self.assertEqual(result.keys(), expected.keys()) + for key, perms in result.items(): + self.assertEqual(set(perms), set(expected[key])) + + +class GetObjectsForUser(TestCase): + + def setUp(self): + self.user = User.objects.create(username='joe') + self.group = Group.objects.create(name='group') + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + + def test_superuser(self): + self.user.is_superuser = True + ctypes = ContentType.objects.all() + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype'], ctypes) + self.assertEqual(set(ctypes), set(objects)) + + def test_anonymous(self): + self.user = AnonymousUser() + ctypes = ContentType.objects.all() + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype'], ctypes) + + obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + assign_perm('change_contenttype', self.user, obj1) + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype'], ctypes) + self.assertEqual(set([obj1]), set(objects)) + + def test_mixed_perms(self): + codenames = [ + get_user_permission_full_codename('change'), + 'auth.change_permission', + ] + self.assertRaises(MixedContentTypeError, get_objects_for_user, + self.user, codenames) + + def test_perms_with_mixed_apps(self): + codenames = [ + get_user_permission_full_codename('change'), + 'contenttypes.change_contenttype', + ] + self.assertRaises(MixedContentTypeError, get_objects_for_user, + self.user, codenames) + + def test_mixed_perms_and_klass(self): + self.assertRaises(MixedContentTypeError, get_objects_for_user, + self.user, ['auth.change_group'], User) + + def test_no_app_label_nor_klass(self): + self.assertRaises(WrongAppError, get_objects_for_user, self.user, + ['change_group']) + + def test_empty_perms_sequence(self): + self.assertEqual( + set(get_objects_for_user(self.user, [], Group.objects.all())), + set() + ) + + def test_perms_single(self): + perm = 'auth.change_group' + assign_perm(perm, self.user, self.group) + self.assertEqual( + set(get_objects_for_user(self.user, perm)), + set(get_objects_for_user(self.user, [perm]))) + + def test_klass_as_model(self): + assign_perm('contenttypes.change_contenttype', self.user, self.ctype) + + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype'], ContentType) + self.assertEqual([obj.name for obj in objects], [self.ctype.name]) + + def test_klass_as_manager(self): + assign_perm('auth.change_group', self.user, self.group) + objects = get_objects_for_user(self.user, ['auth.change_group'], + Group.objects) + self.assertEqual([obj.name for obj in objects], [self.group.name]) + + def test_klass_as_queryset(self): + assign_perm('auth.change_group', self.user, self.group) + objects = get_objects_for_user(self.user, ['auth.change_group'], + Group.objects.all()) + self.assertEqual([obj.name for obj in objects], [self.group.name]) + + def test_ensure_returns_queryset(self): + objects = get_objects_for_user(self.user, ['auth.change_group']) + self.assertTrue(isinstance(objects, QuerySet)) + + def test_simple(self): + group_names = ['group1', 'group2', 'group3'] + groups = [Group.objects.create(name=name) for name in group_names] + for group in groups: + assign_perm('change_group', self.user, group) + + objects = get_objects_for_user(self.user, ['auth.change_group']) + self.assertEqual(len(objects), len(groups)) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects), + set(groups)) + + def test_multiple_perms_to_check(self): + group_names = ['group1', 'group2', 'group3'] + groups = [Group.objects.create(name=name) for name in group_names] + for group in groups: + assign_perm('auth.change_group', self.user, group) + assign_perm('auth.delete_group', self.user, groups[1]) + + objects = get_objects_for_user(self.user, ['auth.change_group', + 'auth.delete_group']) + self.assertEqual(len(objects), 1) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects.values_list('name', flat=True)), + set([groups[1].name])) + + def test_multiple_perms_to_check_no_groups(self): + group_names = ['group1', 'group2', 'group3'] + groups = [Group.objects.create(name=name) for name in group_names] + for group in groups: + assign_perm('auth.change_group', self.user, group) + assign_perm('auth.delete_group', self.user, groups[1]) + + objects = get_objects_for_user(self.user, ['auth.change_group', + 'auth.delete_group'], use_groups=False) + self.assertEqual(len(objects), 1) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects.values_list('name', flat=True)), + set([groups[1].name])) + + def test_any_of_multiple_perms_to_check(self): + group_names = ['group1', 'group2', 'group3'] + groups = [Group.objects.create(name=name) for name in group_names] + assign_perm('auth.change_group', self.user, groups[0]) + assign_perm('auth.delete_group', self.user, groups[2]) + + objects = get_objects_for_user(self.user, ['auth.change_group', + 'auth.delete_group'], any_perm=True) + self.assertEqual(len(objects), 2) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects.values_list('name', flat=True)), + set([groups[0].name, groups[2].name])) + + def test_groups_perms(self): + group1 = Group.objects.create(name='group1') + group2 = Group.objects.create(name='group2') + group3 = Group.objects.create(name='group3') + groups = [group1, group2, group3] + for group in groups: + self.user.groups.add(group) + + # Objects to operate on + ctypes = list(ContentType.objects.all().order_by('id')) + + assign_perm('change_contenttype', self.user, ctypes[0]) + assign_perm('change_contenttype', self.user, ctypes[1]) + assign_perm('delete_contenttype', self.user, ctypes[1]) + assign_perm('delete_contenttype', self.user, ctypes[2]) + + assign_perm('change_contenttype', groups[0], ctypes[3]) + assign_perm('change_contenttype', groups[1], ctypes[3]) + assign_perm('change_contenttype', groups[2], ctypes[4]) + assign_perm('delete_contenttype', groups[0], ctypes[0]) + + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype']) + self.assertEqual( + set(objects.values_list('id', flat=True)), + set(ctypes[i].id for i in [0, 1, 3, 4])) + + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype', + 'contenttypes.delete_contenttype']) + self.assertEqual( + set(objects.values_list('id', flat=True)), + set(ctypes[i].id for i in [0, 1])) + + objects = get_objects_for_user(self.user, + ['contenttypes.change_contenttype']) + self.assertEqual( + set(objects.values_list('id', flat=True)), + set(ctypes[i].id for i in [0, 1, 3, 4])) + +class GetObjectsForGroup(TestCase): + """ + Tests get_objects_for_group function. + """ + def setUp(self): + self.obj1 = ContentType.objects.create(name='ct1', model='foo', + app_label='guardian-tests') + self.obj2 = ContentType.objects.create(name='ct2', model='bar', + app_label='guardian-tests') + self.obj3 = ContentType.objects.create(name='ct3', model='baz', + app_label='guardian-tests') + self.user1 = User.objects.create(username='user1') + self.user2 = User.objects.create(username='user2') + self.user3 = User.objects.create(username='user3') + self.group1 = Group.objects.create(name='group1') + self.group2 = Group.objects.create(name='group2') + self.group3 = Group.objects.create(name='group3') + + def test_mixed_perms(self): + codenames = [ + get_user_permission_full_codename('change'), + 'auth.change_permission', + ] + self.assertRaises(MixedContentTypeError, get_objects_for_group, + self.group1, codenames) + + def test_perms_with_mixed_apps(self): + codenames = [ + get_user_permission_full_codename('change'), + 'contenttypes.contenttypes.change_contenttype', + ] + self.assertRaises(MixedContentTypeError, get_objects_for_group, + self.group1, codenames) + + def test_mixed_perms_and_klass(self): + self.assertRaises(MixedContentTypeError, get_objects_for_group, + self.group1, ['auth.change_group'], User) + + def test_no_app_label_nor_klass(self): + self.assertRaises(WrongAppError, get_objects_for_group, self.group1, + ['change_contenttype']) + + def test_empty_perms_sequence(self): + self.assertEqual( + set(get_objects_for_group(self.group1, [], ContentType)), + set() + ) + + def test_perms_single(self): + perm = 'contenttypes.change_contenttype' + assign_perm(perm, self.group1, self.obj1) + self.assertEqual( + set(get_objects_for_group(self.group1, perm)), + set(get_objects_for_group(self.group1, [perm])) + ) + + def test_klass_as_model(self): + assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) + + objects = get_objects_for_group(self.group1, + ['contenttypes.change_contenttype'], ContentType) + self.assertEqual([obj.name for obj in objects], [self.obj1.name]) + + def test_klass_as_manager(self): + assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) + objects = get_objects_for_group(self.group1, ['change_contenttype'], + ContentType.objects) + self.assertEqual(list(objects), [self.obj1]) + + def test_klass_as_queryset(self): + assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) + objects = get_objects_for_group(self.group1, ['change_contenttype'], + ContentType.objects.all()) + self.assertEqual(list(objects), [self.obj1]) + + def test_ensure_returns_queryset(self): + objects = get_objects_for_group(self.group1, ['contenttypes.change_contenttype']) + self.assertTrue(isinstance(objects, QuerySet)) + + def test_simple(self): + assign_perm('change_contenttype', self.group1, self.obj1) + assign_perm('change_contenttype', self.group1, self.obj2) + + objects = get_objects_for_group(self.group1, 'contenttypes.change_contenttype') + self.assertEqual(len(objects), 2) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual( + set(objects), + set([self.obj1, self.obj2])) + + def test_simple_after_removal(self): + self.test_simple() + remove_perm('change_contenttype', self.group1, self.obj1) + objects = get_objects_for_group(self.group1, 'contenttypes.change_contenttype') + self.assertEqual(len(objects), 1) + self.assertEqual(objects[0], self.obj2) + + def test_multiple_perms_to_check(self): + assign_perm('change_contenttype', self.group1, self.obj1) + assign_perm('delete_contenttype', self.group1, self.obj1) + assign_perm('change_contenttype', self.group1, self.obj2) + + objects = get_objects_for_group(self.group1, [ + 'contenttypes.change_contenttype', + 'contenttypes.delete_contenttype']) + self.assertEqual(len(objects), 1) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual(objects[0], self.obj1) + + def test_any_of_multiple_perms_to_check(self): + assign_perm('change_contenttype', self.group1, self.obj1) + assign_perm('delete_contenttype', self.group1, self.obj1) + assign_perm('add_contenttype', self.group1, self.obj2) + assign_perm('delete_contenttype', self.group1, self.obj3) + + objects = get_objects_for_group(self.group1, + ['contenttypes.change_contenttype', + 'contenttypes.delete_contenttype'], any_perm=True) + self.assertTrue(isinstance(objects, QuerySet)) + self.assertEqual([obj for obj in objects.order_by('name')], + [self.obj1, self.obj3]) + + def test_results_for_different_groups_are_correct(self): + assign_perm('change_contenttype', self.group1, self.obj1) + assign_perm('delete_contenttype', self.group2, self.obj2) + + self.assertEqual(set(get_objects_for_group(self.group1, 'contenttypes.change_contenttype')), + set([self.obj1])) + self.assertEqual(set(get_objects_for_group(self.group2, 'contenttypes.change_contenttype')), + set()) + self.assertEqual(set(get_objects_for_group(self.group2, 'contenttypes.delete_contenttype')), + set([self.obj2])) + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/tags_test.py django-guardian-1.2.0/guardian/testapp/tests/tags_test.py --- django-guardian-1.1.1/guardian/testapp/tests/tags_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/tags_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,132 @@ +from __future__ import unicode_literals +from django.conf import settings +from django.contrib.auth.models import Group, AnonymousUser +from django.contrib.contenttypes.models import ContentType +from django.template import Template, Context, TemplateSyntaxError +from django.test import TestCase + +from guardian.compat import get_user_model +from guardian.exceptions import NotUserNorGroup +from guardian.models import UserObjectPermission, GroupObjectPermission + +User = get_user_model() + +def render(template, context): + """ + Returns rendered ``template`` with ``context``, which are given as string + and dict respectively. + """ + t = Template(template) + return t.render(Context(context)) + +class GetObjPermsTagTest(TestCase): + + def setUp(self): + self.ctype = ContentType.objects.create(name='foo', model='bar', + app_label='fake-for-guardian-tests') + self.group = Group.objects.create(name='jackGroup') + self.user = User.objects.create(username='jack') + self.user.groups.add(self.group) + + def test_wrong_formats(self): + wrong_formats = ( + '{% get_obj_perms user for contenttype as obj_perms %}', # no quotes + '{% get_obj_perms user for contenttype as \'obj_perms" %}', # wrong quotes + '{% get_obj_perms user for contenttype as \'obj_perms" %}', # wrong quotes + '{% get_obj_perms user for contenttype as obj_perms" %}', # wrong quotes + '{% get_obj_perms user for contenttype as obj_perms\' %}', # wrong quotes + '{% get_obj_perms user for contenttype as %}', # no context_var + '{% get_obj_perms for contenttype as "obj_perms" %}', # no user/group + '{% get_obj_perms user contenttype as "obj_perms" %}', # no "for" bit + '{% get_obj_perms user for contenttype "obj_perms" %}', # no "as" bit + '{% get_obj_perms user for as "obj_perms" %}', # no object + ) + + context = {'user': User.get_anonymous(), 'contenttype': self.ctype} + for wrong in wrong_formats: + fullwrong = '{% load guardian_tags %}' + wrong + try: + render(fullwrong, context) + self.fail("Used wrong get_obj_perms tag format: \n\n\t%s\n\n " + "but TemplateSyntaxError have not been raised" % wrong) + except TemplateSyntaxError: + pass + + def test_obj_none(self): + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms user for object as "obj_perms" %}{{ perms }}', + )) + context = {'user': User.get_anonymous(), 'object': None} + output = render(template, context) + self.assertEqual(output, '') + + def test_anonymous_user(self): + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms user for contenttype as "obj_perms" %}{{ perms }}', + )) + context = {'user': AnonymousUser(), 'contenttype': self.ctype} + anon_output = render(template, context) + context = {'user': User.get_anonymous(), 'contenttype': self.ctype} + real_anon_user_output = render(template, context) + self.assertEqual(anon_output, real_anon_user_output) + + def test_wrong_user_or_group(self): + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms some_obj for contenttype as "obj_perms" %}', + )) + context = {'some_obj': ContentType(), 'contenttype': self.ctype} + # This test would raise TemplateSyntaxError instead of NotUserNorGroup + # if TEMPLATE_DEBUG is set to True during tests + tmp = settings.TEMPLATE_DEBUG + settings.TEMPLATE_DEBUG = False + self.assertRaises(NotUserNorGroup, render, template, context) + settings.TEMPLATE_DEBUG = tmp + + def test_superuser(self): + user = User.objects.create(username='superuser', is_superuser=True) + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms user for contenttype as "obj_perms" %}', + '{{ obj_perms|join:" " }}', + )) + context = {'user': user, 'contenttype': self.ctype} + output = render(template, context) + + for perm in ('add_contenttype', 'change_contenttype', 'delete_contenttype'): + self.assertTrue(perm in output) + + def test_user(self): + UserObjectPermission.objects.assign_perm("change_contenttype", self.user, + self.ctype) + GroupObjectPermission.objects.assign_perm("delete_contenttype", self.group, + self.ctype) + + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms user for contenttype as "obj_perms" %}', + '{{ obj_perms|join:" " }}', + )) + context = {'user': self.user, 'contenttype': self.ctype} + output = render(template, context) + + self.assertEqual( + set(output.split(' ')), + set('change_contenttype delete_contenttype'.split(' '))) + + def test_group(self): + GroupObjectPermission.objects.assign_perm("delete_contenttype", self.group, + self.ctype) + + template = ''.join(( + '{% load guardian_tags %}', + '{% get_obj_perms group for contenttype as "obj_perms" %}', + '{{ obj_perms|join:" " }}', + )) + context = {'group': self.group, 'contenttype': self.ctype} + output = render(template, context) + + self.assertEqual(output, 'delete_contenttype') + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/templates/dummy403.html django-guardian-1.2.0/guardian/testapp/tests/templates/dummy403.html --- django-guardian-1.1.1/guardian/testapp/tests/templates/dummy403.html 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/templates/dummy403.html 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1 @@ +foobar403 diff -Nru django-guardian-1.1.1/guardian/testapp/tests/urls.py django-guardian-1.2.0/guardian/testapp/tests/urls.py --- django-guardian-1.1.1/guardian/testapp/tests/urls.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/urls.py 2014-07-22 09:46:49.000000000 +0000 @@ -0,0 +1,12 @@ +from __future__ import unicode_literals +# handler404 and handler500 are needed for admin tests +from guardian.compat import include, patterns, handler404, handler500 # pyflakes:ignore +from django.contrib import admin + +admin.autodiscover() + +urlpatterns = patterns('', + (r'^admin/', include(admin.site.urls)), +) + + diff -Nru django-guardian-1.1.1/guardian/testapp/tests/utils_test.py django-guardian-1.2.0/guardian/testapp/tests/utils_test.py --- django-guardian-1.1.1/guardian/testapp/tests/utils_test.py 1970-01-01 00:00:00.000000000 +0000 +++ django-guardian-1.2.0/guardian/testapp/tests/utils_test.py 2014-07-22 09:46:34.000000000 +0000 @@ -0,0 +1,121 @@ +from __future__ import unicode_literals +from django.test import TestCase +from django.contrib.contenttypes.models import ContentType +from django.contrib.auth.models import Group, AnonymousUser +from django.db import models + +from guardian.compat import get_user_model +from guardian.testapp.tests.conf import skipUnlessTestApp +from guardian.testapp.tests.core_test import ObjectPermissionTestCase +from guardian.testapp.models import Project +from guardian.testapp.models import ProjectUserObjectPermission +from guardian.testapp.models import ProjectGroupObjectPermission +from guardian.models import UserObjectPermission +from guardian.models import UserObjectPermissionBase +from guardian.models import GroupObjectPermission +from guardian.utils import get_anonymous_user +from guardian.utils import get_identity +from guardian.utils import get_user_obj_perms_model +from guardian.utils import get_group_obj_perms_model +from guardian.utils import get_obj_perms_model +from guardian.exceptions import NotUserNorGroup + +User = get_user_model() + +class GetAnonymousUserTest(TestCase): + + def test(self): + anon = get_anonymous_user() + self.assertTrue(isinstance(anon, User)) + +class GetIdentityTest(ObjectPermissionTestCase): + + def test_user(self): + user, group = get_identity(self.user) + self.assertTrue(isinstance(user, User)) + self.assertEqual(group, None) + + def test_anonymous_user(self): + anon = AnonymousUser() + user, group = get_identity(anon) + self.assertTrue(isinstance(user, User)) + self.assertEqual(group, None) + + def test_group(self): + user, group = get_identity(self.group) + self.assertTrue(isinstance(group, Group)) + self.assertEqual(user, None) + + def test_not_user_nor_group(self): + self.assertRaises(NotUserNorGroup, get_identity, 1) + self.assertRaises(NotUserNorGroup, get_identity, "User") + self.assertRaises(NotUserNorGroup, get_identity, User) + + +@skipUnlessTestApp +class GetUserObjPermsModelTest(TestCase): + + def test_for_instance(self): + project = Project(name='Foobar') + self.assertEqual(get_user_obj_perms_model(project), + ProjectUserObjectPermission) + + def test_for_class(self): + self.assertEqual(get_user_obj_perms_model(Project), + ProjectUserObjectPermission) + + def test_default(self): + self.assertEqual(get_user_obj_perms_model(ContentType), + UserObjectPermission) + + def test_user_model(self): + # this test assumes that there were no direct obj perms model to User + # model defined (i.e. while testing guardian app in some custom project) + self.assertEqual(get_user_obj_perms_model(User), + UserObjectPermission) + + +@skipUnlessTestApp +class GetGroupObjPermsModelTest(TestCase): + + def test_for_instance(self): + project = Project(name='Foobar') + self.assertEqual(get_group_obj_perms_model(project), + ProjectGroupObjectPermission) + + def test_for_class(self): + self.assertEqual(get_group_obj_perms_model(Project), + ProjectGroupObjectPermission) + + def test_default(self): + self.assertEqual(get_group_obj_perms_model(ContentType), + GroupObjectPermission) + + def test_group_model(self): + # this test assumes that there were no direct obj perms model to Group + # model defined (i.e. while testing guardian app in some custom project) + self.assertEqual(get_group_obj_perms_model(Group), + GroupObjectPermission) + +class GetObjPermsModelTest(TestCase): + + def test_image_field(self): + + class SomeModel(models.Model): + image = models.FileField(upload_to='images/') + + obj = SomeModel() + perm_model = get_obj_perms_model(obj, UserObjectPermissionBase, + UserObjectPermission) + self.assertEqual(perm_model, UserObjectPermission) + + def test_file_field(self): + + class SomeModel2(models.Model): + file = models.FileField(upload_to='images/') + + obj = SomeModel2() + perm_model = get_obj_perms_model(obj, UserObjectPermissionBase, + UserObjectPermission) + self.assertEqual(perm_model, UserObjectPermission) + diff -Nru django-guardian-1.1.1/guardian/tests/admin_test.py django-guardian-1.2.0/guardian/tests/admin_test.py --- django-guardian-1.1.1/guardian/tests/admin_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/admin_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,456 +0,0 @@ -from __future__ import unicode_literals -import copy - -from django import forms -from django.conf import settings -from django.contrib import admin -from django.contrib.contenttypes.models import ContentType -from django.core.urlresolvers import reverse -from django.http import HttpRequest -from django.test import TestCase -from django.test.client import Client - -from guardian.admin import GuardedModelAdmin -from guardian.compat import get_user_model -from guardian.compat import str -from guardian.shortcuts import get_perms -from guardian.shortcuts import get_perms_for_model -from guardian.tests.conf import TEST_SETTINGS -from guardian.tests.conf import override_settings -from guardian.models import Group -from guardian.tests.testapp.models import LogEntryWithGroup as LogEntry - -User = get_user_model() - -class ContentTypeGuardedAdmin(GuardedModelAdmin): - pass - -try: - admin.site.unregister(ContentType) -except admin.sites.NotRegistered: - pass -admin.site.register(ContentType, ContentTypeGuardedAdmin) - -@override_settings(**TEST_SETTINGS) -class AdminTests(TestCase): - - def setUp(self): - self.admin = User.objects.create_superuser('admin', 'admin@example.com', - 'admin') - self.user = User.objects.create_user('joe', 'joe@example.com', 'joe') - self.group = Group.objects.create(name='group') - self.client = Client() - self.obj = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.obj_info = self.obj._meta.app_label, self.obj._meta.module_name - - def tearDown(self): - self.client.logout() - - def _login_superuser(self): - self.client.login(username='admin', password='admin') - - def test_view_manage_wrong_obj(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, - kwargs={'object_pk': -10, 'user_id': self.user.id}) - response = self.client.get(url) - self.assertEqual(response.status_code, 404) - - def test_view(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - response = self.client.get(url) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.context['object'], self.obj) - - def test_view_manage_wrong_user(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, - kwargs={'object_pk': self.obj.pk, 'user_id': -10}) - response = self.client.get(url) - self.assertEqual(response.status_code, 404) - - def test_view_manage_user_form(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'user': self.user.username, 'submit_manage_user': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - redirect_url = reverse('admin:%s_%s_permissions_manage_user' % - self.obj_info, kwargs={'object_pk': self.obj.pk, - 'user_id': self.user.id}) - self.assertEqual(response.request['PATH_INFO'], redirect_url) - - def test_view_manage_negative_user_form(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - self.user = User.objects.create(username='negative_id_user', id=-2010) - data = {'user': self.user.username, 'submit_manage_user': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - redirect_url = reverse('admin:%s_%s_permissions_manage_user' % - self.obj_info, args=[self.obj.pk, self.user.id]) - self.assertEqual(response.request['PATH_INFO'], redirect_url) - - def test_view_manage_user_form_wrong_user(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'user': 'wrong-user', 'submit_manage_user': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('user' in response.context['user_form'].errors) - - def test_view_manage_user_form_wrong_field(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'user': '', 'submit_manage_user': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('user' in response.context['user_form'].errors) - - def test_view_manage_user_form_empty_user(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'user': '', 'submit_manage_user': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('user' in response.context['user_form'].errors) - - def test_view_manage_user_wrong_perms(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, - args=[self.obj.pk, self.user.id]) - perms = ['change_user'] # This is not self.obj related permission - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(response.status_code, 200) - self.assertTrue('permissions' in response.context['form'].errors) - - def test_view_manage_user(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_user' % self.obj_info, - args=[self.obj.pk, self.user.id]) - response = self.client.get(url) - self.assertEqual(response.status_code, 200) - - choices = set([c[0] for c in - response.context['form'].fields['permissions'].choices]) - self.assertEqual( - set([ p.codename for p in get_perms_for_model(self.obj)]), - choices, - ) - - # Add some perms and check if changes were persisted - perms = ['change_%s' % self.obj_info[1], 'delete_%s' % self.obj_info[1]] - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - - self.assertEqual( - set(get_perms(self.user, self.obj)), - set(perms), - ) - - # Remove perm and check if change was persisted - perms = ['change_%s' % self.obj_info[1]] - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - - self.assertEqual( - set(get_perms(self.user, self.obj)), - set(perms), - ) - - def test_view_manage_group_form(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'group': self.group.name, 'submit_manage_group': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - redirect_url = reverse('admin:%s_%s_permissions_manage_group' % - self.obj_info, args=[self.obj.pk, self.group.id]) - self.assertEqual(response.request['PATH_INFO'], redirect_url) - - def test_view_manage_negative_group_form(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - self.group = Group.objects.create(name='neagive_id_group', id=-2010) - data = {'group': self.group.name, 'submit_manage_group': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - redirect_url = reverse('admin:%s_%s_permissions_manage_group' % - self.obj_info, args=[self.obj.pk, self.group.id]) - self.assertEqual(response.request['PATH_INFO'], redirect_url) - - def test_view_manage_group_form_wrong_group(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'group': 'wrong-group', 'submit_manage_group': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('group' in response.context['group_form'].errors) - - def test_view_manage_group_form_wrong_field(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'group': '', 'submit_manage_group': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('group' in response.context['group_form'].errors) - - def test_view_manage_group_form_empty_group(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions' % self.obj_info, - args=[self.obj.pk]) - data = {'group': '', 'submit_manage_group': 'submit'} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 0) - self.assertEqual(response.status_code, 200) - self.assertTrue('group' in response.context['group_form'].errors) - - def test_view_manage_group_wrong_perms(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_group' % - self.obj_info, args=[self.obj.pk, self.group.id]) - perms = ['change_user'] # This is not self.obj related permission - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(response.status_code, 200) - self.assertTrue('permissions' in response.context['form'].errors) - - def test_view_manage_group(self): - self._login_superuser() - url = reverse('admin:%s_%s_permissions_manage_group' % - self.obj_info, args=[self.obj.pk, self.group.id]) - response = self.client.get(url) - self.assertEqual(response.status_code, 200) - - choices = set([c[0] for c in - response.context['form'].fields['permissions'].choices]) - self.assertEqual( - set([ p.codename for p in get_perms_for_model(self.obj)]), - choices, - ) - - # Add some perms and check if changes were persisted - perms = ['change_%s' % self.obj_info[1], 'delete_%s' % self.obj_info[1]] - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - - self.assertEqual( - set(get_perms(self.group, self.obj)), - set(perms), - ) - - # Remove perm and check if change was persisted - perms = ['delete_%s' % self.obj_info[1]] - data = {'permissions': perms} - response = self.client.post(url, data, follow=True) - self.assertEqual(len(response.redirect_chain), 1) - self.assertEqual(response.redirect_chain[0][1], 302) - - self.assertEqual( - set(get_perms(self.group, self.obj)), - set(perms), - ) - -if 'django.contrib.admin' not in settings.INSTALLED_APPS: - # Skip admin tests if admin app is not registered - # we simpy clean up AdminTests class ... - # TODO: use @unittest.skipUnless('django.contrib.admin' in settings.INSTALLED_APPS) - # if possible (requires Python 2.7, though) - AdminTests = type('AdminTests', (TestCase,), {}) # pyflakes:ignore - - -class GuardedModelAdminTests(TestCase): - - def _get_gma(self, attrs=None, name=None, model=None): - """ - Returns ``GuardedModelAdmin`` instance. - """ - attrs = attrs or {} - name = str(name or 'GMA') - model = model or User - GMA = type(name, (GuardedModelAdmin,), attrs) - gma = GMA(model, admin.site) - return gma - - def test_obj_perms_manage_template_attr(self): - attrs = {'obj_perms_manage_template': 'foobar.html'} - gma = self._get_gma(attrs=attrs) - self.assertTrue(gma.get_obj_perms_manage_template(), 'foobar.html') - - def test_obj_perms_manage_user_template_attr(self): - attrs = {'obj_perms_manage_user_template': 'foobar.html'} - gma = self._get_gma(attrs=attrs) - self.assertTrue(gma.get_obj_perms_manage_user_template(), 'foobar.html') - - def test_obj_perms_manage_user_form_attr(self): - attrs = {'obj_perms_manage_user_form': forms.Form} - gma = self._get_gma(attrs=attrs) - self.assertTrue(gma.get_obj_perms_manage_user_form(), forms.Form) - - def test_obj_perms_manage_group_template_attr(self): - attrs = {'obj_perms_manage_group_template': 'foobar.html'} - gma = self._get_gma(attrs=attrs) - self.assertTrue(gma.get_obj_perms_manage_group_template(), - 'foobar.html') - - def test_obj_perms_manage_group_form_attr(self): - attrs = {'obj_perms_manage_group_form': forms.Form} - gma = self._get_gma(attrs=attrs) - self.assertTrue(gma.get_obj_perms_manage_group_form(), forms.Form) - - def test_user_can_acces_owned_objects_only(self): - attrs = { - 'user_can_access_owned_objects_only': True, - 'user_owned_objects_field': 'user', - } - gma = self._get_gma(attrs=attrs, model=LogEntry) - joe = User.objects.create_user('joe', 'joe@example.com', 'joe') - jane = User.objects.create_user('jane', 'jane@example.com', 'jane') - ctype = ContentType.objects.get_for_model(User) - joe_entry = LogEntry.objects.create(user=joe, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo') - LogEntry.objects.create(user=jane, content_type=ctype, - object_id=jane.id, action_flag=1, change_message='bar') - request = HttpRequest() - request.user = joe - qs = gma.queryset(request) - self.assertEqual([e.pk for e in qs], [joe_entry.pk]) - - def test_user_can_acces_owned_objects_only_unless_superuser(self): - attrs = { - 'user_can_access_owned_objects_only': True, - 'user_owned_objects_field': 'user', - } - gma = self._get_gma(attrs=attrs, model=LogEntry) - joe = User.objects.create_superuser('joe', 'joe@example.com', 'joe') - jane = User.objects.create_user('jane', 'jane@example.com', 'jane') - ctype = ContentType.objects.get_for_model(User) - joe_entry = LogEntry.objects.create(user=joe, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo') - jane_entry = LogEntry.objects.create(user=jane, content_type=ctype, - object_id=jane.id, action_flag=1, change_message='bar') - request = HttpRequest() - request.user = joe - qs = gma.queryset(request) - self.assertEqual(sorted([e.pk for e in qs]), - sorted([joe_entry.pk, jane_entry.pk])) - - def test_user_can_access_owned_by_group_objects_only(self): - attrs = { - 'user_can_access_owned_by_group_objects_only': True, - 'group_owned_objects_field': 'group', - } - gma = self._get_gma(attrs=attrs, model=LogEntry) - joe = User.objects.create_user('joe', 'joe@example.com', 'joe') - joe_group = Group.objects.create(name='joe-group') - joe.groups.add(joe_group) - jane = User.objects.create_user('jane', 'jane@example.com', 'jane') - jane_group = Group.objects.create(name='jane-group') - jane.groups.add(jane_group) - ctype = ContentType.objects.get_for_model(User) - LogEntry.objects.create(user=joe, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo') - LogEntry.objects.create(user=jane, content_type=ctype, - object_id=jane.id, action_flag=1, change_message='bar') - joe_entry_group = LogEntry.objects.create(user=jane, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo', - group=joe_group) - request = HttpRequest() - request.user = joe - qs = gma.queryset(request) - self.assertEqual([e.pk for e in qs], [joe_entry_group.pk]) - - def test_user_can_access_owned_by_group_objects_only_unless_superuser(self): - attrs = { - 'user_can_access_owned_by_group_objects_only': True, - 'group_owned_objects_field': 'group', - } - gma = self._get_gma(attrs=attrs, model=LogEntry) - joe = User.objects.create_superuser('joe', 'joe@example.com', 'joe') - joe_group = Group.objects.create(name='joe-group') - joe.groups.add(joe_group) - jane = User.objects.create_user('jane', 'jane@example.com', 'jane') - jane_group = Group.objects.create(name='jane-group') - jane.groups.add(jane_group) - ctype = ContentType.objects.get_for_model(User) - LogEntry.objects.create(user=joe, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo') - LogEntry.objects.create(user=jane, content_type=ctype, - object_id=jane.id, action_flag=1, change_message='bar') - LogEntry.objects.create(user=jane, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo', - group=joe_group) - LogEntry.objects.create(user=joe, content_type=ctype, - object_id=joe.id, action_flag=1, change_message='foo', - group=jane_group) - request = HttpRequest() - request.user = joe - qs = gma.queryset(request) - self.assertEqual(sorted(e.pk for e in qs), - sorted(LogEntry.objects.values_list('pk', flat=True))) - - -class GrappelliGuardedModelAdminTests(TestCase): - - org_installed_apps = copy.copy(settings.INSTALLED_APPS) - - def _get_gma(self, attrs=None, name=None, model=None): - """ - Returns ``GuardedModelAdmin`` instance. - """ - attrs = attrs or {} - name = str(name or 'GMA') - model = model or User - GMA = type(name, (GuardedModelAdmin,), attrs) - gma = GMA(model, admin.site) - return gma - - def setUp(self): - settings.INSTALLED_APPS = ['grappelli'] + list(settings.INSTALLED_APPS) - - def tearDown(self): - settings.INSTALLED_APPS = self.org_installed_apps - - def test_get_obj_perms_manage_template(self): - gma = self._get_gma() - self.assertEqual(gma.get_obj_perms_manage_template(), - 'admin/guardian/contrib/grappelli/obj_perms_manage.html') - - def test_get_obj_perms_manage_user_template(self): - gma = self._get_gma() - self.assertEqual(gma.get_obj_perms_manage_user_template(), - 'admin/guardian/contrib/grappelli/obj_perms_manage_user.html') - - def test_get_obj_perms_manage_group_template(self): - gma = self._get_gma() - self.assertEqual(gma.get_obj_perms_manage_group_template(), - 'admin/guardian/contrib/grappelli/obj_perms_manage_group.html') - diff -Nru django-guardian-1.1.1/guardian/tests/conf.py django-guardian-1.2.0/guardian/tests/conf.py --- django-guardian-1.1.1/guardian/tests/conf.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/conf.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -from __future__ import unicode_literals -import os -from guardian.utils import abspath -from django.conf import settings -from django.conf import UserSettingsHolder -from django.utils.functional import wraps - - -THIS = abspath(os.path.dirname(__file__)) -TEST_TEMPLATES_DIR = abspath(THIS, 'templates') - - -TEST_SETTINGS = dict( - TEMPLATE_DIRS=[TEST_TEMPLATES_DIR], -) - -class TestDataMixin(object): - def setUp(self): - super(TestDataMixin, self).setUp() - from django.contrib.auth.models import Group - try: - from django.contrib.auth import get_user_model - User = get_user_model() - except ImportError: - from django.contrib.auth.models import User - Group.objects.create(pk=1, name='admins') - jack_group = Group.objects.create(pk=2, name='jackGroup') - User.objects.get_or_create(id=settings.ANONYMOUS_USER_ID) - jack = User.objects.create(id=1, username='jack', is_active=True, - is_superuser=False, is_staff=False) - jack.groups.add(jack_group) - - -class override_settings(object): - """ - Acts as either a decorator, or a context manager. If it's a decorator it - takes a function and returns a wrapped function. If it's a contextmanager - it's used with the ``with`` statement. In either event entering/exiting - are called before and after, respectively, the function/block is executed. - """ - def __init__(self, **kwargs): - self.options = kwargs - self.wrapped = settings._wrapped - - def __enter__(self): - self.enable() - - def __exit__(self, exc_type, exc_value, traceback): - self.disable() - - def __call__(self, test_func): - from django.test import TransactionTestCase - if isinstance(test_func, type) and issubclass(test_func, TransactionTestCase): - original_pre_setup = test_func._pre_setup - original_post_teardown = test_func._post_teardown - def _pre_setup(innerself): - self.enable() - original_pre_setup(innerself) - def _post_teardown(innerself): - original_post_teardown(innerself) - self.disable() - test_func._pre_setup = _pre_setup - test_func._post_teardown = _post_teardown - return test_func - else: - @wraps(test_func) - def inner(*args, **kwargs): - with self: - return test_func(*args, **kwargs) - return inner - - def enable(self): - override = UserSettingsHolder(settings._wrapped) - for key, new_value in self.options.items(): - setattr(override, key, new_value) - settings._wrapped = override - - def disable(self): - settings._wrapped = self.wrapped - diff -Nru django-guardian-1.1.1/guardian/tests/conf_test.py django-guardian-1.2.0/guardian/tests/conf_test.py --- django-guardian-1.1.1/guardian/tests/conf_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/conf_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -from __future__ import unicode_literals -import mock -from django.core.exceptions import ImproperlyConfigured -from django.test import TestCase -from guardian.conf import settings as guardian_settings - - -class TestConfiguration(TestCase): - - def test_check_configuration(self): - - with mock.patch('guardian.conf.settings.RENDER_403', True): - with mock.patch('guardian.conf.settings.RAISE_403', True): - self.assertRaises(ImproperlyConfigured, - guardian_settings.check_configuration) - diff -Nru django-guardian-1.1.1/guardian/tests/core_test.py django-guardian-1.2.0/guardian/tests/core_test.py --- django-guardian-1.1.1/guardian/tests/core_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/core_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -from __future__ import unicode_literals -from itertools import chain - -from django.conf import settings -from django.contrib.auth import models as auth_app -from django.contrib.auth.management import create_permissions -from django.contrib.auth.models import Group, Permission, AnonymousUser -from django.contrib.contenttypes.models import ContentType -from django.test import TestCase - -from guardian.core import ObjectPermissionChecker -from guardian.compat import get_user_model -from guardian.exceptions import NotUserNorGroup -from guardian.models import UserObjectPermission, GroupObjectPermission -from guardian.shortcuts import assign_perm - -User = get_user_model() - -class ObjectPermissionTestCase(TestCase): - - def setUp(self): - self.group, created = Group.objects.get_or_create(name='jackGroup') - self.user, created = User.objects.get_or_create(username='jack') - self.user.groups.add(self.group) - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.anonymous_user, created = User.objects.get_or_create( - id=settings.ANONYMOUS_USER_ID, - username='AnonymousUser') - - -class ObjectPermissionCheckerTest(ObjectPermissionTestCase): - - def setUp(self): - super(ObjectPermissionCheckerTest, self).setUp() - # Required if MySQL backend is used :/ - create_permissions(auth_app, [], 1) - - def test_cache_for_queries_count(self): - settings.DEBUG = True - try: - from django.db import connection - - ContentType.objects.clear_cache() - checker = ObjectPermissionChecker(self.user) - - # has_perm on Checker should spawn only two queries plus one extra - # for fetching the content type first time we check for specific - # model and two more content types as there are additional checks - # at get_user_obj_perms_model and get_group_obj_perms_model - query_count = len(connection.queries) - res = checker.has_perm("change_group", self.group) - self.assertEqual(len(connection.queries), query_count + 5) - - # Checking again shouldn't spawn any queries - query_count = len(connection.queries) - res_new = checker.has_perm("change_group", self.group) - self.assertEqual(res, res_new) - self.assertEqual(len(connection.queries), query_count) - - # Checking for other permission but for Group object again - # shouldn't spawn any query too - query_count = len(connection.queries) - checker.has_perm("delete_group", self.group) - self.assertEqual(len(connection.queries), query_count) - - # Checking for same model but other instance should spawn 2 queries - new_group = Group.objects.create(name='new-group') - query_count = len(connection.queries) - checker.has_perm("change_group", new_group) - self.assertEqual(len(connection.queries), query_count + 2) - - # Checking for permission for other model should spawn 3 queries - # (again: content type and actual permissions for the object... - query_count = len(connection.queries) - checker.has_perm("change_user", self.user) - self.assertEqual(len(connection.queries), query_count + 3) - - finally: - settings.DEBUG = False - - def test_init(self): - self.assertRaises(NotUserNorGroup, ObjectPermissionChecker, - user_or_group=ContentType()) - self.assertRaises(NotUserNorGroup, ObjectPermissionChecker) - - def test_anonymous_user(self): - user = AnonymousUser() - check = ObjectPermissionChecker(user) - # assert anonymous user has no object permissions at all for obj - self.assertTrue( [] == list(check.get_perms(self.ctype)) ) - - def test_superuser(self): - user = User.objects.create(username='superuser', is_superuser=True) - check = ObjectPermissionChecker(user) - ctype = ContentType.objects.get_for_model(self.ctype) - perms = sorted(chain(*Permission.objects - .filter(content_type=ctype) - .values_list('codename'))) - self.assertEqual(perms, check.get_perms(self.ctype)) - for perm in perms: - self.assertTrue(check.has_perm(perm, self.ctype)) - - def test_not_active_superuser(self): - user = User.objects.create(username='not_active_superuser', - is_superuser=True, is_active=False) - check = ObjectPermissionChecker(user) - ctype = ContentType.objects.get_for_model(self.ctype) - perms = sorted(chain(*Permission.objects - .filter(content_type=ctype) - .values_list('codename'))) - self.assertEqual(check.get_perms(self.ctype), []) - for perm in perms: - self.assertFalse(check.has_perm(perm, self.ctype)) - - def test_not_active_user(self): - user = User.objects.create(username='notactive') - assign_perm("change_contenttype", user, self.ctype) - - # new ObjectPermissionChecker is created for each User.has_perm call - self.assertTrue(user.has_perm("change_contenttype", self.ctype)) - user.is_active = False - self.assertFalse(user.has_perm("change_contenttype", self.ctype)) - - # use on one checker only (as user's is_active attr should be checked - # before try to use cache - user = User.objects.create(username='notactive-cache') - assign_perm("change_contenttype", user, self.ctype) - - check = ObjectPermissionChecker(user) - self.assertTrue(check.has_perm("change_contenttype", self.ctype)) - user.is_active = False - self.assertFalse(check.has_perm("change_contenttype", self.ctype)) - - def test_get_perms(self): - group = Group.objects.create(name='group') - obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - - assign_perms = { - group: ('change_group', 'delete_group'), - obj1: ('change_contenttype', 'delete_contenttype'), - obj2: ('delete_contenttype',), - } - - check = ObjectPermissionChecker(self.user) - - for obj, perms in assign_perms.items(): - for perm in perms: - UserObjectPermission.objects.assign_perm(perm, self.user, obj) - self.assertEqual(sorted(perms), sorted(check.get_perms(obj))) - - check = ObjectPermissionChecker(self.group) - - for obj, perms in assign_perms.items(): - for perm in perms: - GroupObjectPermission.objects.assign_perm(perm, self.group, obj) - self.assertEqual(sorted(perms), sorted(check.get_perms(obj))) - diff -Nru django-guardian-1.1.1/guardian/tests/custompkmodel_test.py django-guardian-1.2.0/guardian/tests/custompkmodel_test.py --- django-guardian-1.1.1/guardian/tests/custompkmodel_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/custompkmodel_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -from __future__ import unicode_literals -from django.contrib.contenttypes.models import ContentType -from django.test import TestCase - -from guardian.compat import get_user_model -from guardian.shortcuts import assign_perm, remove_perm - - -class CustomPKModelTest(TestCase): - """ - Tests agains custom model with primary key other than *standard* - ``id`` integer field. - """ - - def setUp(self): - self.user = get_user_model().objects.create(username='joe') - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - - def test_assign_perm(self): - assign_perm('contenttypes.change_contenttype', self.user, self.ctype) - self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - - def test_remove_perm(self): - assign_perm('contenttypes.change_contenttype', self.user, self.ctype) - self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - remove_perm('contenttypes.change_contenttype', self.user, self.ctype) - self.assertFalse(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - diff -Nru django-guardian-1.1.1/guardian/tests/decorators_test.py django-guardian-1.2.0/guardian/tests/decorators_test.py --- django-guardian-1.1.1/guardian/tests/decorators_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/decorators_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,356 +0,0 @@ -from __future__ import unicode_literals -import mock -from django.conf import settings -from django.contrib.auth.models import Group, AnonymousUser -from django.core.exceptions import PermissionDenied -from django.db.models.base import ModelBase -from django.http import HttpRequest -from django.http import HttpResponse -from django.http import HttpResponseForbidden -from django.http import HttpResponseRedirect -from django.shortcuts import get_object_or_404 -from django.template import TemplateDoesNotExist -from django.test import TestCase - -from guardian.compat import get_user_model -from guardian.compat import get_user_model_path -from guardian.compat import get_user_permission_full_codename -from guardian.decorators import permission_required, permission_required_or_403 -from guardian.exceptions import GuardianError -from guardian.exceptions import WrongAppError -from guardian.shortcuts import assign_perm -from guardian.tests.conf import TEST_SETTINGS -from guardian.tests.conf import TestDataMixin -from guardian.tests.conf import override_settings - -User = get_user_model() -user_model_path = get_user_model_path() - - -@override_settings(**TEST_SETTINGS) -class PermissionRequiredTest(TestDataMixin, TestCase): - - def setUp(self): - super(PermissionRequiredTest, self).setUp() - self.anon = AnonymousUser() - self.user = User.objects.get_or_create(username='jack')[0] - self.group = Group.objects.get_or_create(name='jackGroup')[0] - - def _get_request(self, user=None): - if user is None: - user = AnonymousUser() - request = HttpRequest() - request.user = user - return request - - def test_no_args(self): - - try: - @permission_required - def dummy_view(request): - return HttpResponse('dummy_view') - except GuardianError: - pass - else: - self.fail("Trying to decorate using permission_required without " - "permission as first argument should raise exception") - - def test_RENDER_403_is_false(self): - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - - with mock.patch('guardian.conf.settings.RENDER_403', False): - response = dummy_view(request) - self.assertEqual(response.content, b'') - self.assertTrue(isinstance(response, HttpResponseForbidden)) - - @mock.patch('guardian.conf.settings.RENDER_403', True) - def test_TEMPLATE_403_setting(self): - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - - with mock.patch('guardian.conf.settings.TEMPLATE_403', 'dummy403.html'): - response = dummy_view(request) - self.assertEqual(response.content, b'foobar403\n') - - @mock.patch('guardian.conf.settings.RENDER_403', True) - def test_403_response_is_empty_if_template_cannot_be_found(self): - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - with mock.patch('guardian.conf.settings.TEMPLATE_403', - '_non-exisitng-403.html'): - response = dummy_view(request) - self.assertEqual(response.status_code, 403) - self.assertEqual(response.content, b'') - - @mock.patch('guardian.conf.settings.RENDER_403', True) - def test_403_response_raises_error_if_debug_is_turned_on(self): - org_DEBUG = settings.DEBUG - settings.DEBUG = True - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - with mock.patch('guardian.conf.settings.TEMPLATE_403', - '_non-exisitng-403.html'): - self.assertRaises(TemplateDoesNotExist, dummy_view, request) - settings.DEBUG = org_DEBUG - - @mock.patch('guardian.conf.settings.RENDER_403', False) - @mock.patch('guardian.conf.settings.RAISE_403', True) - def test_RAISE_403_setting_is_true(self): - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - - self.assertRaises(PermissionDenied, dummy_view, request) - - def test_anonymous_user_wrong_app(self): - - request = self._get_request(self.anon) - - @permission_required_or_403('not_installed_app.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - self.assertEqual(dummy_view(request).status_code, 403) - - def test_anonymous_user_wrong_codename(self): - - request = self._get_request() - - @permission_required_or_403('auth.wrong_codename') - def dummy_view(request): - return HttpResponse('dummy_view') - self.assertEqual(dummy_view(request).status_code, 403) - - def test_anonymous_user(self): - - request = self._get_request() - - @permission_required_or_403('auth.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - self.assertEqual(dummy_view(request).status_code, 403) - - def test_wrong_lookup_variables_number(self): - - request = self._get_request() - - try: - @permission_required_or_403('auth.change_user', (User, 'username')) - def dummy_view(request, username): - pass - dummy_view(request, username='jack') - except GuardianError: - pass - else: - self.fail("If lookup variables are passed they must be tuple of: " - "(ModelClass/app_label.ModelClass/queryset, " - ")\n" - "Otherwise GuardianError should be raised") - - def test_wrong_lookup_variables(self): - - request = self._get_request() - - args = ( - (2010, 'username', 'username'), - ('User', 'username', 'username'), - (User, 'username', 'no_arg'), - ) - for tup in args: - try: - @permission_required_or_403('auth.change_user', tup) - def show_user(request, username): - user = get_object_or_404(User, username=username) - return HttpResponse("It's %s here!" % user.username) - show_user(request, 'jack') - except GuardianError: - pass - else: - self.fail("Wrong arguments given but GuardianError not raised") - - def test_user_has_no_access(self): - - request = self._get_request() - - @permission_required_or_403('auth.change_user') - def dummy_view(request): - return HttpResponse('dummy_view') - self.assertEqual(dummy_view(request).status_code, 403) - - def test_user_has_access(self): - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - assign_perm(perm, self.user, obj=joe) - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - user_model_path, 'username', 'username')) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'dummy_view') - - def test_user_has_access_on_model_with_metaclass(self): - """ - Test to the fix issues of comparaison made via type() - in the decorator. In the case of a `Model` implementing - a custom metaclass, the decorator fail because type - doesn't return `ModelBase` - """ - perm = get_user_permission_full_codename('change') - - class TestMeta(ModelBase): - pass - - class ProxyUser(User): - class Meta: - proxy = True - app_label = User._meta.app_label - __metaclass__ = TestMeta - - joe, created = ProxyUser.objects.get_or_create(username='joe') - assign_perm(perm, self.user, obj=joe) - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - ProxyUser, 'username', 'username')) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'dummy_view') - - def test_user_has_obj_access_even_if_we_also_check_for_global(self): - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - assign_perm(perm, self.user, obj=joe) - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - user_model_path, 'username', 'username'), accept_global_perms=True) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'dummy_view') - - def test_user_has_no_obj_perm_access(self): - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - user_model_path, 'username', 'username')) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 403) - - def test_user_has_global_perm_access_but_flag_not_set(self): - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - assign_perm(perm, self.user) - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - user_model_path, 'username', 'username')) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 403) - - def test_user_has_global_perm_access(self): - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - assign_perm(perm, self.user) - - request = self._get_request(self.user) - - @permission_required_or_403(perm, ( - user_model_path, 'username', 'username'), accept_global_perms=True) - def dummy_view(request, username): - return HttpResponse('dummy_view') - response = dummy_view(request, username='joe') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'dummy_view') - - def test_model_lookup(self): - - request = self._get_request(self.user) - - perm = get_user_permission_full_codename('change') - joe, created = User.objects.get_or_create(username='joe') - assign_perm(perm, self.user, obj=joe) - - models = ( - user_model_path, - User, - User.objects.filter(is_active=True), - ) - for model in models: - @permission_required_or_403(perm, (model, 'username', 'username')) - def dummy_view(request, username): - get_object_or_404(User, username=username) - return HttpResponse('hello') - response = dummy_view(request, username=joe.username) - self.assertEqual(response.content, b'hello') - - def test_redirection_raises_wrong_app_error(self): - from .testapp.models import Project - request = self._get_request(self.user) - - User.objects.create(username='foo') - Project.objects.create(name='foobar') - - @permission_required('auth.change_group', - (Project, 'name', 'group_name'), - login_url='/foobar/') - def dummy_view(request, project_name): - pass - # 'auth.change_group' is wrong permission codename (should be one - # related with User - self.assertRaises(WrongAppError, dummy_view, request, group_name='foobar') - - def test_redirection(self): - from .testapp.models import Project - - request = self._get_request(self.user) - - User.objects.create(username='foo') - Project.objects.create(name='foobar') - - @permission_required('testapp.change_project', - (Project, 'name', 'project_name'), - login_url='/foobar/') - def dummy_view(request, project_name): - pass - response = dummy_view(request, project_name='foobar') - self.assertTrue(isinstance(response, HttpResponseRedirect)) - self.assertTrue(response._headers['location'][1].startswith( - '/foobar/')) - diff -Nru django-guardian-1.1.1/guardian/tests/direct_rel_test.py django-guardian-1.2.0/guardian/tests/direct_rel_test.py --- django-guardian-1.1.1/guardian/tests/direct_rel_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/direct_rel_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,195 +0,0 @@ -from __future__ import unicode_literals -from .testapp.models import Mixed -from .testapp.models import Project -from .testapp.models import ProjectGroupObjectPermission -from .testapp.models import ProjectUserObjectPermission -from django.contrib.auth.models import Group, Permission -from django.test import TestCase -from guardian.compat import get_user_model -from guardian.shortcuts import assign_perm -from guardian.shortcuts import get_groups_with_perms -from guardian.shortcuts import get_objects_for_group -from guardian.shortcuts import get_objects_for_user -from guardian.shortcuts import get_users_with_perms -from guardian.shortcuts import remove_perm - - -User = get_user_model() - - -class TestDirectUserPermissions(TestCase): - - def setUp(self): - self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') - self.project = Project.objects.create(name='Foobar') - - def get_perm(self, codename): - filters = {'content_type__app_label': 'testapp', 'codename': codename} - return Permission.objects.get(**filters) - - def test_after_perm_is_created_without_shortcut(self): - perm = self.get_perm('add_project') - # we should not use assign here - if generic user obj perms model is - # used then everything could go fine if using assign shortcut and we - # would not be able to see any problem - ProjectUserObjectPermission.objects.create( - user=self.joe, - permission=perm, - content_object=self.project, - ) - self.assertTrue(self.joe.has_perm('add_project', self.project)) - - def test_assign_perm(self): - assign_perm('add_project', self.joe, self.project) - filters = { - 'content_object': self.project, - 'permission__codename': 'add_project', - 'user': self.joe, - } - result = ProjectUserObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 1) - - def test_remove_perm(self): - assign_perm('add_project', self.joe, self.project) - filters = { - 'content_object': self.project, - 'permission__codename': 'add_project', - 'user': self.joe, - } - result = ProjectUserObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 1) - - remove_perm('add_project', self.joe, self.project) - result = ProjectUserObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 0) - - def test_get_users_with_perms(self): - User.objects.create_user('john', 'john@foobar.com', 'john') - jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') - assign_perm('add_project', self.joe, self.project) - assign_perm('change_project', self.joe, self.project) - assign_perm('change_project', jane, self.project) - self.assertEqual(get_users_with_perms(self.project, attach_perms=True), - { - self.joe: ['add_project', 'change_project'], - jane: ['change_project'], - }) - - def test_get_users_with_perms_plus_groups(self): - User.objects.create_user('john', 'john@foobar.com', 'john') - jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') - group = Group.objects.create(name='devs') - self.joe.groups.add(group) - assign_perm('add_project', self.joe, self.project) - assign_perm('change_project', group, self.project) - assign_perm('change_project', jane, self.project) - self.assertEqual(get_users_with_perms(self.project, attach_perms=True), - { - self.joe: ['add_project', 'change_project'], - jane: ['change_project'], - }) - - def test_get_objects_for_user(self): - foo = Project.objects.create(name='foo') - bar = Project.objects.create(name='bar') - assign_perm('add_project', self.joe, foo) - assign_perm('add_project', self.joe, bar) - assign_perm('change_project', self.joe, bar) - - result = get_objects_for_user(self.joe, 'testapp.add_project') - self.assertEqual(sorted(p.pk for p in result), sorted([foo.pk, bar.pk])) - - -class TestDirectGroupPermissions(TestCase): - - def setUp(self): - self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') - self.group = Group.objects.create(name='admins') - self.joe.groups.add(self.group) - self.project = Project.objects.create(name='Foobar') - - def get_perm(self, codename): - filters = {'content_type__app_label': 'testapp', 'codename': codename} - return Permission.objects.get(**filters) - - def test_after_perm_is_created_without_shortcut(self): - perm = self.get_perm('add_project') - # we should not use assign here - if generic user obj perms model is - # used then everything could go fine if using assign shortcut and we - # would not be able to see any problem - ProjectGroupObjectPermission.objects.create( - group=self.group, - permission=perm, - content_object=self.project, - ) - self.assertTrue(self.joe.has_perm('add_project', self.project)) - - def test_assign_perm(self): - assign_perm('add_project', self.group, self.project) - filters = { - 'content_object': self.project, - 'permission__codename': 'add_project', - 'group': self.group, - } - result = ProjectGroupObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 1) - - def test_remove_perm(self): - assign_perm('add_project', self.group, self.project) - filters = { - 'content_object': self.project, - 'permission__codename': 'add_project', - 'group': self.group, - } - result = ProjectGroupObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 1) - - remove_perm('add_project', self.group, self.project) - result = ProjectGroupObjectPermission.objects.filter(**filters).count() - self.assertEqual(result, 0) - - def test_get_groups_with_perms(self): - Group.objects.create(name='managers') - devs = Group.objects.create(name='devs') - assign_perm('add_project', self.group, self.project) - assign_perm('change_project', self.group, self.project) - assign_perm('change_project', devs, self.project) - self.assertEqual(get_groups_with_perms(self.project, attach_perms=True), - { - self.group: ['add_project', 'change_project'], - devs: ['change_project'], - }) - - def test_get_objects_for_group(self): - foo = Project.objects.create(name='foo') - bar = Project.objects.create(name='bar') - assign_perm('add_project', self.group, foo) - assign_perm('add_project', self.group, bar) - assign_perm('change_project', self.group, bar) - - result = get_objects_for_group(self.group, 'testapp.add_project') - self.assertEqual(sorted(p.pk for p in result), sorted([foo.pk, bar.pk])) - - -class TestMixedDirectAndGenericObjectPermission(TestCase): - - def setUp(self): - self.joe = User.objects.create_user('joe', 'joe@example.com', 'foobar') - self.group = Group.objects.create(name='admins') - self.joe.groups.add(self.group) - self.mixed = Mixed.objects.create(name='Foobar') - - def test_get_users_with_perms_plus_groups(self): - User.objects.create_user('john', 'john@foobar.com', 'john') - jane = User.objects.create_user('jane', 'jane@foobar.com', 'jane') - group = Group.objects.create(name='devs') - self.joe.groups.add(group) - assign_perm('add_mixed', self.joe, self.mixed) - assign_perm('change_mixed', group, self.mixed) - assign_perm('change_mixed', jane, self.mixed) - self.assertEqual(get_users_with_perms(self.mixed, attach_perms=True), - { - self.joe: ['add_mixed', 'change_mixed'], - jane: ['change_mixed'], - }) - diff -Nru django-guardian-1.1.1/guardian/tests/forms_test.py django-guardian-1.2.0/guardian/tests/forms_test.py --- django-guardian-1.1.1/guardian/tests/forms_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/forms_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -from __future__ import unicode_literals - -from django.contrib.contenttypes.models import ContentType -from django.test import TestCase -from guardian.compat import get_user_model -from guardian.forms import BaseObjectPermissionsForm - -class BaseObjectPermissionsFormTests(TestCase): - - def setUp(self): - self.user = get_user_model().objects.create_user( - 'joe', 'joe@example.com', 'joe') - self.obj = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - - def test_not_implemented(self): - - class MyUserObjectPermissionsForm(BaseObjectPermissionsForm): - - def __init__(formself, user, *args, **kwargs): - self.user = user - super(MyUserObjectPermissionsForm, formself).__init__(*args, - **kwargs) - - form = MyUserObjectPermissionsForm(self.user, self.obj, {}) - self.assertRaises(NotImplementedError, form.save_obj_perms) - - field_name = form.get_obj_perms_field_name() - self.assertTrue(form.is_valid()) - self.assertEqual(len(form.cleaned_data[field_name]), 0) - diff -Nru django-guardian-1.1.1/guardian/tests/__init__.py django-guardian-1.2.0/guardian/tests/__init__.py --- django-guardian-1.1.1/guardian/tests/__init__.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/__init__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -from __future__ import unicode_literals -import django -from django.conf import settings - -from .conf_test import * -from .core_test import * -from .custompkmodel_test import * -from .decorators_test import * -from .direct_rel_test import * -from .forms_test import * -from .managers_test import * -from .orphans_test import * -from .other_test import * -from .utils_test import * -from .shortcuts_test import * -from .tags_test import * - - -if 'django.contrib.admin' in settings.INSTALLED_APPS: - from .admin_test import * -if django.VERSION >= (1, 3): - from .mixins_test import * - diff -Nru django-guardian-1.1.1/guardian/tests/managers_test.py django-guardian-1.2.0/guardian/tests/managers_test.py --- django-guardian-1.1.1/guardian/tests/managers_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/managers_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -from __future__ import unicode_literals -from django.test import TestCase -from guardian.managers import UserObjectPermissionManager -from guardian.managers import GroupObjectPermissionManager -import mock - - -class TestManagers(TestCase): - - def test_user_manager_assign(self): - manager = UserObjectPermissionManager() - manager.assign_perm = mock.Mock() - manager.assign('perm', 'user', 'object') - manager.assign_perm.assert_called_once_with('perm', 'user', 'object') - - def test_group_manager_assign(self): - manager = GroupObjectPermissionManager() - manager.assign_perm = mock.Mock() - manager.assign('perm', 'group', 'object') - manager.assign_perm.assert_called_once_with('perm', 'group', 'object') - diff -Nru django-guardian-1.1.1/guardian/tests/mixins_test.py django-guardian-1.2.0/guardian/tests/mixins_test.py --- django-guardian-1.1.1/guardian/tests/mixins_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/mixins_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -from __future__ import unicode_literals - -from django.contrib.contenttypes.models import ContentType -from django.contrib.auth.models import AnonymousUser -from django.core.exceptions import ImproperlyConfigured -from django.core.exceptions import PermissionDenied -from django.http import HttpResponse -from django.test import TestCase -from django.test.client import RequestFactory -from django.views.generic import View -from mock import Mock - -from guardian.compat import get_user_model -from guardian.mixins import LoginRequiredMixin -from guardian.mixins import PermissionRequiredMixin - -class DatabaseRemovedError(Exception): - pass - - -class RemoveDatabaseView(View): - def get(self, request, *args, **kwargs): - raise DatabaseRemovedError("You've just allowed db to be removed!") - -class TestView(PermissionRequiredMixin, RemoveDatabaseView): - permission_required = 'contenttypes.change_contenttype' - object = None # should be set at each tests explicitly - -class NoObjectView(PermissionRequiredMixin, RemoveDatabaseView): - permission_required = 'contenttypes.change_contenttype' - -class TestViewMixins(TestCase): - - def setUp(self): - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.factory = RequestFactory() - self.user = get_user_model().objects.create_user( - 'joe', 'joe@doe.com', 'doe') - self.client.login(username='joe', password='doe') - - def test_permission_is_checked_before_view_is_computed(self): - """ - This test would fail if permission is checked **after** view is - actually resolved. - """ - request = self.factory.get('/') - request.user = self.user - # View.object is set - view = TestView.as_view(object=self.ctype) - response = view(request) - self.assertEqual(response.status_code, 302) - - # View.get_object returns object - TestView.get_object = lambda instance: self.ctype - view = TestView.as_view() - response = view(request) - self.assertEqual(response.status_code, 302) - del TestView.get_object - - def test_permission_is_checked_before_view_is_computed_perm_denied_raised(self): - """ - This test would fail if permission is checked **after** view is - actually resolved. - """ - request = self.factory.get('/') - request.user = self.user - view = TestView.as_view(raise_exception=True, object=self.ctype) - with self.assertRaises(PermissionDenied): - view(request) - - def test_permission_required_view_configured_wrongly(self): - """ - This test would fail if permission is checked **after** view is - actually resolved. - """ - request = self.factory.get('/') - request.user = self.user - request.user.add_obj_perm('change_contenttype', self.ctype) - view = TestView.as_view(permission_required=None, object=self.ctype) - with self.assertRaises(ImproperlyConfigured): - view(request) - - def test_permission_required(self): - """ - This test would fail if permission is checked **after** view is - actually resolved. - """ - request = self.factory.get('/') - request.user = self.user - request.user.add_obj_perm('change_contenttype', self.ctype) - view = TestView.as_view(object=self.ctype) - with self.assertRaises(DatabaseRemovedError): - view(request) - - def test_permission_required_no_object(self): - """ - This test would fail if permission is checked on a view's - object when it has none - """ - - request = self.factory.get('/') - request.user = self.user - request.user.add_obj_perm('change_contenttype', self.ctype) - view = NoObjectView.as_view() - response = view(request) - self.assertEqual(response.status_code, 302) - - def test_permission_required_as_list(self): - """ - This test would fail if permission is checked **after** view is - actually resolved. - """ - - global TestView - class SecretView(TestView): - on_permission_check_fail = Mock() - - request = self.factory.get('/') - request.user = self.user - request.user.add_obj_perm('change_contenttype', self.ctype) - SecretView.permission_required = ['contenttypes.change_contenttype', - 'contenttypes.add_contenttype'] - view = SecretView.as_view(object=self.ctype) - response = view(request) - self.assertEqual(response.status_code, 302) - SecretView.on_permission_check_fail.assert_called_once_with(request, - response, obj=self.ctype) - - request.user.add_obj_perm('add_contenttype', self.ctype) - with self.assertRaises(DatabaseRemovedError): - view(request) - - def test_login_required_mixin(self): - - class SecretView(LoginRequiredMixin, View): - redirect_field_name = 'foobar' - login_url = '/let-me-in/' - - def get(self, request): - return HttpResponse('secret-view') - - request = self.factory.get('/some-secret-page/') - request.user = AnonymousUser() - - view = SecretView.as_view() - - response = view(request) - self.assertEqual(response.status_code, 302) - self.assertEqual(response['Location'], - '/let-me-in/?foobar=/some-secret-page/') - - request.user = self.user - response = view(request) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'secret-view') - diff -Nru django-guardian-1.1.1/guardian/tests/orphans_test.py django-guardian-1.2.0/guardian/tests/orphans_test.py --- django-guardian-1.1.1/guardian/tests/orphans_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/orphans_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -from __future__ import unicode_literals -from django.contrib.auth import models as auth_app -from django.contrib.auth.management import create_permissions -from django.contrib.contenttypes.models import ContentType -from django.core.management import call_command -from django.test import TestCase - -from guardian.compat import get_user_model -from guardian.utils import clean_orphan_obj_perms -from guardian.shortcuts import assign_perm -from guardian.models import Group - - -User = get_user_model() -user_module_name = User._meta.module_name - - -class OrphanedObjectPermissionsTest(TestCase): - - def setUp(self): - # Create objects for which we would assing obj perms - self.target_user1 = User.objects.create(username='user1') - self.target_group1 = Group.objects.create(name='group1') - self.target_obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='fake-for-guardian-tests') - self.target_obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='fake-for-guardian-tests') - # Required if MySQL backend is used :/ - create_permissions(auth_app, [], 1) - - - self.user = User.objects.create(username='user') - self.group = Group.objects.create(name='group') - - def test_clean_perms(self): - - # assign obj perms - target_perms = { - self.target_user1: ["change_%s" % user_module_name], - self.target_group1: ["delete_group"], - self.target_obj1: ["change_contenttype", "delete_contenttype"], - self.target_obj2: ["change_contenttype"], - } - obj_perms_count = sum([len(val) for key, val in target_perms.items()]) - for target, perms in target_perms.items(): - target.__old_pk = target.pk # Store pkeys - for perm in perms: - assign_perm(perm, self.user, target) - - # Remove targets - for target, perms in target_perms.items(): - target.delete() - - # Clean orphans - removed = clean_orphan_obj_perms() - self.assertEqual(removed, obj_perms_count) - - # Recreate targets and check if user has no permissions - for target, perms in target_perms.items(): - target.pk = target.__old_pk - target.save() - for perm in perms: - self.assertFalse(self.user.has_perm(perm, target)) - - def test_clean_perms_command(self): - """ - Same test as the one above but rather function directly, we call - management command instead. - """ - - # assign obj perms - target_perms = { - self.target_user1: ["change_%s" % user_module_name], - self.target_group1: ["delete_group"], - self.target_obj1: ["change_contenttype", "delete_contenttype"], - self.target_obj2: ["change_contenttype"], - } - for target, perms in target_perms.items(): - target.__old_pk = target.pk # Store pkeys - for perm in perms: - assign_perm(perm, self.user, target) - - # Remove targets - for target, perms in target_perms.items(): - target.delete() - - # Clean orphans - call_command("clean_orphan_obj_perms", verbosity=0) - - # Recreate targets and check if user has no permissions - for target, perms in target_perms.items(): - target.pk = target.__old_pk - target.save() - for perm in perms: - self.assertFalse(self.user.has_perm(perm, target)) - diff -Nru django-guardian-1.1.1/guardian/tests/other_test.py django-guardian-1.2.0/guardian/tests/other_test.py --- django-guardian-1.1.1/guardian/tests/other_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/other_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,318 +0,0 @@ -from __future__ import unicode_literals - -from itertools import chain -from django.contrib.auth.models import AnonymousUser -from django.contrib.auth.models import Group -from django.contrib.auth.models import Permission -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError -from django.test import TestCase - -import guardian -from guardian.backends import ObjectPermissionBackend -from guardian.compat import get_user_model -from guardian.compat import get_user_model_path -from guardian.compat import get_user_permission_codename -from guardian.compat import basestring -from guardian.compat import unicode -from guardian.exceptions import GuardianError -from guardian.exceptions import NotUserNorGroup -from guardian.exceptions import ObjectNotPersisted -from guardian.exceptions import WrongAppError -from guardian.models import GroupObjectPermission -from guardian.models import UserObjectPermission -from guardian.tests.conf import TestDataMixin - -User = get_user_model() -user_model_path = get_user_model_path() - - -class UserPermissionTests(TestDataMixin, TestCase): - - def setUp(self): - super(UserPermissionTests, self).setUp() - self.user = User.objects.get(username='jack') - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - self.obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - - def test_assignement(self): - self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) - - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, - self.ctype) - self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) - self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - - def test_assignement_and_remove(self): - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, - self.ctype) - self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) - - UserObjectPermission.objects.remove_perm('change_contenttype', - self.user, self.ctype) - self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) - - def test_ctypes(self): - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj1) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) - - UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj1) - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj2) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) - - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj1) - UserObjectPermission.objects.assign_perm('change_contenttype', self.user, self.obj2) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) - - UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj1) - UserObjectPermission.objects.remove_perm('change_contenttype', self.user, self.obj2) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) - - def test_get_for_object(self): - perms = UserObjectPermission.objects.get_for_object(self.user, self.ctype) - self.assertEqual(perms.count(), 0) - - to_assign = sorted([ - 'delete_contenttype', - 'change_contenttype', - ]) - - for perm in to_assign: - UserObjectPermission.objects.assign_perm(perm, self.user, self.ctype) - - perms = UserObjectPermission.objects.get_for_object(self.user, self.ctype) - codenames = sorted(chain(*perms.values_list('permission__codename'))) - - self.assertEqual(to_assign, codenames) - - def test_assign_perm_validation(self): - self.assertRaises(Permission.DoesNotExist, - UserObjectPermission.objects.assign_perm, 'change_group', self.user, - self.user) - - group = Group.objects.create(name='test_group_assign_perm_validation') - ctype = ContentType.objects.get_for_model(group) - codename = codename=get_user_permission_codename('change') - perm = Permission.objects.get(codename=codename) - - create_info = dict( - permission = perm, - user = self.user, - content_type = ctype, - object_pk = group.pk - ) - self.assertRaises(ValidationError, UserObjectPermission.objects.create, - **create_info) - - def test_unicode(self): - codename = get_user_permission_codename('change') - obj_perm = UserObjectPermission.objects.assign_perm(codename, - self.user, self.user) - self.assertTrue(isinstance(obj_perm.__unicode__(), unicode)) - - def test_errors(self): - not_saved_user = User(username='not_saved_user') - codename = get_user_permission_codename('change') - self.assertRaises(ObjectNotPersisted, - UserObjectPermission.objects.assign_perm, - codename, self.user, not_saved_user) - self.assertRaises(ObjectNotPersisted, - UserObjectPermission.objects.remove_perm, - codename, self.user, not_saved_user) - self.assertRaises(ObjectNotPersisted, - UserObjectPermission.objects.get_for_object, - codename, not_saved_user) - -class GroupPermissionTests(TestDataMixin, TestCase): - - def setUp(self): - super(GroupPermissionTests, self).setUp() - self.user = User.objects.get(username='jack') - self.group, created = Group.objects.get_or_create(name='jackGroup') - self.user.groups.add(self.group) - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - self.obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - - def test_assignement(self): - self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) - self.assertFalse(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.ctype) - self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) - self.assertTrue(self.user.has_perm('contenttypes.change_contenttype', - self.ctype)) - - def test_assignement_and_remove(self): - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.ctype) - self.assertTrue(self.user.has_perm('change_contenttype', self.ctype)) - - GroupObjectPermission.objects.remove_perm('change_contenttype', - self.group, self.ctype) - self.assertFalse(self.user.has_perm('change_contenttype', self.ctype)) - - def test_ctypes(self): - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.obj1) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) - - GroupObjectPermission.objects.remove_perm('change_contenttype', - self.group, self.obj1) - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.obj2) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) - - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.obj1) - GroupObjectPermission.objects.assign_perm('change_contenttype', self.group, - self.obj2) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj2)) - self.assertTrue(self.user.has_perm('change_contenttype', self.obj1)) - - GroupObjectPermission.objects.remove_perm('change_contenttype', - self.group, self.obj1) - GroupObjectPermission.objects.remove_perm('change_contenttype', - self.group, self.obj2) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj2)) - self.assertFalse(self.user.has_perm('change_contenttype', self.obj1)) - - def test_get_for_object(self): - group = Group.objects.create(name='get_group_perms_for_object') - self.user.groups.add(group) - - perms = GroupObjectPermission.objects.get_for_object(group, self.ctype) - self.assertEqual(perms.count(), 0) - - to_assign = sorted([ - 'delete_contenttype', - 'change_contenttype', - ]) - - for perm in to_assign: - GroupObjectPermission.objects.assign_perm(perm, group, self.ctype) - - perms = GroupObjectPermission.objects.get_for_object(group, self.ctype) - codenames = sorted(chain(*perms.values_list('permission__codename'))) - - self.assertEqual(to_assign, codenames) - - def test_assign_perm_validation(self): - self.assertRaises(Permission.DoesNotExist, - GroupObjectPermission.objects.assign_perm, 'change_user', self.group, - self.group) - - user = User.objects.create(username='test_user_assign_perm_validation') - ctype = ContentType.objects.get_for_model(user) - perm = Permission.objects.get(codename='change_group') - - create_info = dict( - permission = perm, - group = self.group, - content_type = ctype, - object_pk = user.pk - ) - self.assertRaises(ValidationError, GroupObjectPermission.objects.create, - **create_info) - - def test_unicode(self): - obj_perm = GroupObjectPermission.objects.assign_perm("change_group", - self.group, self.group) - self.assertTrue(isinstance(obj_perm.__unicode__(), unicode)) - - def test_errors(self): - not_saved_group = Group(name='not_saved_group') - self.assertRaises(ObjectNotPersisted, - GroupObjectPermission.objects.assign_perm, - "change_group", self.group, not_saved_group) - self.assertRaises(ObjectNotPersisted, - GroupObjectPermission.objects.remove_perm, - "change_group", self.group, not_saved_group) - self.assertRaises(ObjectNotPersisted, - GroupObjectPermission.objects.get_for_object, - "change_group", not_saved_group) - -class ObjectPermissionBackendTests(TestCase): - - def setUp(self): - self.user = User.objects.create(username='jack') - self.backend = ObjectPermissionBackend() - - def test_attrs(self): - self.assertTrue(self.backend.supports_anonymous_user) - self.assertTrue(self.backend.supports_object_permissions) - self.assertTrue(self.backend.supports_inactive_user) - - def test_authenticate(self): - self.assertEqual(self.backend.authenticate( - self.user.username, self.user.password), None) - - def test_has_perm_noobj(self): - result = self.backend.has_perm(self.user, "change_contenttype") - self.assertFalse(result) - - def test_has_perm_notauthed(self): - user = AnonymousUser() - self.assertFalse(self.backend.has_perm(user, "change_user", self.user)) - - def test_has_perm_wrong_app(self): - self.assertRaises(WrongAppError, self.backend.has_perm, - self.user, "no_app.change_user", self.user) - - def test_obj_is_not_model(self): - for obj in (Group, 666, "String", [2, 1, 5, 7], {}): - self.assertFalse(self.backend.has_perm(self.user, - "any perm", obj)) - - def test_not_active_user(self): - user = User.objects.create(username='non active user') - ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - perm = 'change_contenttype' - UserObjectPermission.objects.assign_perm(perm, user, ctype) - self.assertTrue(self.backend.has_perm(user, perm, ctype)) - user.is_active = False - user.save() - self.assertFalse(self.backend.has_perm(user, perm, ctype)) - - -class GuardianBaseTests(TestCase): - - def has_attrs(self): - self.assertTrue(hasattr(guardian, '__version__')) - - def test_version(self): - for x in guardian.VERSION: - self.assertTrue(isinstance(x, (int, basestring))) - - def test_get_version(self): - self.assertTrue(isinstance(guardian.get_version(), basestring)) - - -class TestExceptions(TestCase): - - def _test_error_class(self, exc_cls): - self.assertTrue(isinstance(exc_cls, GuardianError)) - - def test_error_classes(self): - self.assertTrue(isinstance(GuardianError(), Exception)) - guardian_errors = [NotUserNorGroup] - for err in guardian_errors: - self._test_error_class(err()) - diff -Nru django-guardian-1.1.1/guardian/tests/shortcuts_test.py django-guardian-1.2.0/guardian/tests/shortcuts_test.py --- django-guardian-1.1.1/guardian/tests/shortcuts_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/shortcuts_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,695 +0,0 @@ -from __future__ import unicode_literals - -import warnings - -from django.contrib.contenttypes.models import ContentType -from django.db.models.query import QuerySet -from django.test import TestCase - -from guardian.shortcuts import get_perms_for_model -from guardian.core import ObjectPermissionChecker -from guardian.compat import get_user_model -from guardian.compat import get_user_permission_full_codename -from guardian.shortcuts import assign -from guardian.shortcuts import assign_perm -from guardian.shortcuts import remove_perm -from guardian.shortcuts import get_perms -from guardian.shortcuts import get_users_with_perms -from guardian.shortcuts import get_groups_with_perms -from guardian.shortcuts import get_objects_for_user -from guardian.shortcuts import get_objects_for_group -from guardian.exceptions import MixedContentTypeError -from guardian.exceptions import NotUserNorGroup -from guardian.exceptions import WrongAppError -from guardian.tests.core_test import ObjectPermissionTestCase -from guardian.models import Group, Permission - -User = get_user_model() -user_app_label = User._meta.app_label -user_module_name = User._meta.module_name - -class ShortcutsTests(ObjectPermissionTestCase): - - def test_get_perms_for_model(self): - self.assertEqual(get_perms_for_model(self.user).count(), 3) - self.assertTrue(list(get_perms_for_model(self.user)) == - list(get_perms_for_model(User))) - self.assertEqual(get_perms_for_model(Permission).count(), 3) - - model_str = 'contenttypes.ContentType' - self.assertEqual( - sorted(get_perms_for_model(model_str).values_list()), - sorted(get_perms_for_model(ContentType).values_list())) - obj = ContentType() - self.assertEqual( - sorted(get_perms_for_model(model_str).values_list()), - sorted(get_perms_for_model(obj).values_list())) - -class AssignPermTest(ObjectPermissionTestCase): - """ - Tests permission assigning for user/group and object. - """ - def test_not_model(self): - self.assertRaises(NotUserNorGroup, assign_perm, - perm="change_object", - user_or_group="Not a Model", - obj=self.ctype) - - def test_global_wrong_perm(self): - self.assertRaises(ValueError, assign_perm, - perm="change_site", # for global permissions must provide app_label - user_or_group=self.user) - - def test_user_assign_perm(self): - assign_perm("change_contenttype", self.user, self.ctype) - assign_perm("change_contenttype", self.group, self.ctype) - self.assertTrue(self.user.has_perm("change_contenttype", self.ctype)) - - def test_group_assign_perm(self): - assign_perm("change_contenttype", self.group, self.ctype) - assign_perm("delete_contenttype", self.group, self.ctype) - - check = ObjectPermissionChecker(self.group) - self.assertTrue(check.has_perm("change_contenttype", self.ctype)) - self.assertTrue(check.has_perm("delete_contenttype", self.ctype)) - - def test_user_assign_perm_global(self): - perm = assign_perm("contenttypes.change_contenttype", self.user) - self.assertTrue(self.user.has_perm("contenttypes.change_contenttype")) - self.assertTrue(isinstance(perm, Permission)) - - def test_group_assign_perm_global(self): - perm = assign_perm("contenttypes.change_contenttype", self.group) - - self.assertTrue(self.user.has_perm("contenttypes.change_contenttype")) - self.assertTrue(isinstance(perm, Permission)) - - def test_deprecation_warning(self): - with warnings.catch_warnings(record=True) as warns: - warnings.simplefilter('always') - assign("contenttypes.change_contenttype", self.group) - self.assertEqual(len(warns), 1) - self.assertTrue(isinstance(warns[0].message, DeprecationWarning)) - - -class RemovePermTest(ObjectPermissionTestCase): - """ - Tests object permissions removal. - """ - def test_not_model(self): - self.assertRaises(NotUserNorGroup, remove_perm, - perm="change_object", - user_or_group="Not a Model", - obj=self.ctype) - - def test_global_wrong_perm(self): - self.assertRaises(ValueError, remove_perm, - perm="change_site", # for global permissions must provide app_label - user_or_group=self.user) - - def test_user_remove_perm(self): - # assign perm first - assign_perm("change_contenttype", self.user, self.ctype) - remove_perm("change_contenttype", self.user, self.ctype) - self.assertFalse(self.user.has_perm("change_contenttype", self.ctype)) - - def test_group_remove_perm(self): - # assign perm first - assign_perm("change_contenttype", self.group, self.ctype) - remove_perm("change_contenttype", self.group, self.ctype) - - check = ObjectPermissionChecker(self.group) - self.assertFalse(check.has_perm("change_contenttype", self.ctype)) - - def test_user_remove_perm_global(self): - # assign perm first - perm = "contenttypes.change_contenttype" - assign_perm(perm, self.user) - remove_perm(perm, self.user) - self.assertFalse(self.user.has_perm(perm)) - - def test_group_remove_perm_global(self): - # assign perm first - perm = "contenttypes.change_contenttype" - assign_perm(perm, self.group) - remove_perm(perm, self.group) - app_label, codename = perm.split('.') - perm_obj = Permission.objects.get(codename=codename, - content_type__app_label=app_label) - self.assertFalse(perm_obj in self.group.permissions.all()) - - -class GetPermsTest(ObjectPermissionTestCase): - """ - Tests get_perms function (already done at core tests but left here as a - placeholder). - """ - def test_not_model(self): - self.assertRaises(NotUserNorGroup, get_perms, - user_or_group=None, - obj=self.ctype) - - def test_user(self): - perms_to_assign = ("change_contenttype",) - - for perm in perms_to_assign: - assign_perm("change_contenttype", self.user, self.ctype) - - perms = get_perms(self.user, self.ctype) - for perm in perms_to_assign: - self.assertTrue(perm in perms) - -class GetUsersWithPermsTest(TestCase): - """ - Tests get_users_with_perms function. - """ - def setUp(self): - self.obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - self.obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - self.user1 = User.objects.create(username='user1') - self.user2 = User.objects.create(username='user2') - self.user3 = User.objects.create(username='user3') - self.group1 = Group.objects.create(name='group1') - self.group2 = Group.objects.create(name='group2') - self.group3 = Group.objects.create(name='group3') - - def test_empty(self): - result = get_users_with_perms(self.obj1) - self.assertTrue(isinstance(result, QuerySet)) - self.assertEqual(list(result), []) - - result = get_users_with_perms(self.obj1, attach_perms=True) - self.assertTrue(isinstance(result, dict)) - self.assertFalse(bool(result)) - - def test_simple(self): - assign_perm("change_contenttype", self.user1, self.obj1) - assign_perm("delete_contenttype", self.user2, self.obj1) - assign_perm("delete_contenttype", self.user3, self.obj2) - - result = get_users_with_perms(self.obj1) - result_vals = result.values_list('username', flat=True) - - self.assertEqual( - set(result_vals), - set([user.username for user in (self.user1, self.user2)]), - ) - - def test_users_groups_perms(self): - self.user1.groups.add(self.group1) - self.user2.groups.add(self.group2) - self.user3.groups.add(self.group3) - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.group2, self.obj1) - assign_perm("delete_contenttype", self.group3, self.obj2) - - result = get_users_with_perms(self.obj1).values_list('id', - flat=True) - self.assertEqual( - set(result), - set([u.id for u in (self.user1, self.user2)]) - ) - - def test_users_groups_after_removal(self): - self.test_users_groups_perms() - remove_perm("change_contenttype", self.group1, self.obj1) - - result = get_users_with_perms(self.obj1).values_list('id', - flat=True) - self.assertEqual( - set(result), - set([self.user2.id]), - ) - - def test_attach_perms(self): - self.user1.groups.add(self.group1) - self.user2.groups.add(self.group2) - self.user3.groups.add(self.group3) - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.group2, self.obj1) - assign_perm("delete_contenttype", self.group3, self.obj2) - assign_perm("delete_contenttype", self.user2, self.obj1) - assign_perm("change_contenttype", self.user3, self.obj2) - - # Check contenttype1 - result = get_users_with_perms(self.obj1, attach_perms=True) - expected = { - self.user1: ["change_contenttype"], - self.user2: ["change_contenttype", "delete_contenttype"], - } - self.assertEqual(result.keys(), expected.keys()) - for key, perms in result.items(): - self.assertEqual(set(perms), set(expected[key])) - - # Check contenttype2 - result = get_users_with_perms(self.obj2, attach_perms=True) - expected = { - self.user3: ["change_contenttype", "delete_contenttype"], - } - self.assertEqual(result.keys(), expected.keys()) - for key, perms in result.items(): - self.assertEqual(set(perms), set(expected[key])) - - def test_attach_groups_only_has_perms(self): - self.user1.groups.add(self.group1) - assign_perm("change_contenttype", self.group1, self.obj1) - result = get_users_with_perms(self.obj1, attach_perms=True) - expected = {self.user1: ["change_contenttype"]} - self.assertEqual(result, expected) - - def test_mixed(self): - self.user1.groups.add(self.group1) - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.user2, self.obj1) - assign_perm("delete_contenttype", self.user2, self.obj1) - assign_perm("delete_contenttype", self.user2, self.obj2) - assign_perm("change_contenttype", self.user3, self.obj2) - assign_perm("change_%s" % user_module_name, self.user3, self.user1) - - result = get_users_with_perms(self.obj1) - self.assertEqual( - set(result), - set([self.user1, self.user2]), - ) - - def test_with_superusers(self): - admin = User.objects.create(username='admin', is_superuser=True) - assign_perm("change_contenttype", self.user1, self.obj1) - - result = get_users_with_perms(self.obj1, with_superusers=True) - self.assertEqual( - set(result), - set([self.user1, admin]), - ) - - def test_without_group_users(self): - self.user1.groups.add(self.group1) - self.user2.groups.add(self.group2) - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.user2, self.obj1) - assign_perm("change_contenttype", self.group2, self.obj1) - result = get_users_with_perms(self.obj1, with_group_users=False) - expected = set([self.user2]) - self.assertEqual(set(result), expected) - - def test_without_group_users_but_perms_attached(self): - self.user1.groups.add(self.group1) - self.user2.groups.add(self.group2) - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.user2, self.obj1) - assign_perm("change_contenttype", self.group2, self.obj1) - result = get_users_with_perms(self.obj1, with_group_users=False, - attach_perms=True) - expected = {self.user2: ["change_contenttype"]} - self.assertEqual(result, expected) - - def test_without_group_users_no_result(self): - self.user1.groups.add(self.group1) - assign_perm("change_contenttype", self.group1, self.obj1) - result = get_users_with_perms(self.obj1, attach_perms=True, - with_group_users=False) - expected = {} - self.assertEqual(result, expected) - - def test_without_group_users_no_result_but_with_superusers(self): - admin = User.objects.create(username='admin', is_superuser=True) - self.user1.groups.add(self.group1) - assign_perm("change_contenttype", self.group1, self.obj1) - result = get_users_with_perms(self.obj1, with_group_users=False, - with_superusers=True) - expected = [admin] - self.assertEqual(set(result), set(expected)) - - -class GetGroupsWithPerms(TestCase): - """ - Tests get_groups_with_perms function. - """ - def setUp(self): - self.obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - self.obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - self.user1 = User.objects.create(username='user1') - self.user2 = User.objects.create(username='user2') - self.user3 = User.objects.create(username='user3') - self.group1 = Group.objects.create(name='group1') - self.group2 = Group.objects.create(name='group2') - self.group3 = Group.objects.create(name='group3') - - def test_empty(self): - result = get_groups_with_perms(self.obj1) - self.assertTrue(isinstance(result, QuerySet)) - self.assertFalse(bool(result)) - - result = get_groups_with_perms(self.obj1, attach_perms=True) - self.assertTrue(isinstance(result, dict)) - self.assertFalse(bool(result)) - - def test_simple(self): - assign_perm("change_contenttype", self.group1, self.obj1) - result = get_groups_with_perms(self.obj1) - self.assertEqual(len(result), 1) - self.assertEqual(result[0], self.group1) - - def test_simple_after_removal(self): - self.test_simple() - remove_perm("change_contenttype", self.group1, self.obj1) - result = get_groups_with_perms(self.obj1) - self.assertEqual(len(result), 0) - - def test_simple_attach_perms(self): - assign_perm("change_contenttype", self.group1, self.obj1) - result = get_groups_with_perms(self.obj1, attach_perms=True) - expected = {self.group1: ["change_contenttype"]} - self.assertEqual(result, expected) - - def test_simple_attach_perms_after_removal(self): - self.test_simple_attach_perms() - remove_perm("change_contenttype", self.group1, self.obj1) - result = get_groups_with_perms(self.obj1, attach_perms=True) - self.assertEqual(len(result), 0) - - def test_mixed(self): - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.group1, self.obj2) - assign_perm("change_%s" % user_module_name, self.group1, self.user3) - assign_perm("change_contenttype", self.group2, self.obj2) - assign_perm("change_contenttype", self.group2, self.obj1) - assign_perm("delete_contenttype", self.group2, self.obj1) - assign_perm("change_%s" % user_module_name, self.group3, self.user1) - - result = get_groups_with_perms(self.obj1) - self.assertEqual(set(result), set([self.group1, self.group2])) - - def test_mixed_attach_perms(self): - assign_perm("change_contenttype", self.group1, self.obj1) - assign_perm("change_contenttype", self.group1, self.obj2) - assign_perm("change_group", self.group1, self.group3) - assign_perm("change_contenttype", self.group2, self.obj2) - assign_perm("change_contenttype", self.group2, self.obj1) - assign_perm("delete_contenttype", self.group2, self.obj1) - assign_perm("change_group", self.group3, self.group1) - - result = get_groups_with_perms(self.obj1, attach_perms=True) - expected = { - self.group1: ["change_contenttype"], - self.group2: ["change_contenttype", "delete_contenttype"], - } - self.assertEqual(result.keys(), expected.keys()) - for key, perms in result.items(): - self.assertEqual(set(perms), set(expected[key])) - - -class GetObjectsForUser(TestCase): - - def setUp(self): - self.user = User.objects.create(username='joe') - self.group = Group.objects.create(name='group') - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - - def test_superuser(self): - self.user.is_superuser = True - ctypes = ContentType.objects.all() - objects = get_objects_for_user(self.user, - ['contenttypes.change_contenttype'], ctypes) - self.assertEqual(set(ctypes), set(objects)) - - def test_mixed_perms(self): - codenames = [ - get_user_permission_full_codename('change'), - 'auth.change_permission', - ] - self.assertRaises(MixedContentTypeError, get_objects_for_user, - self.user, codenames) - - def test_perms_with_mixed_apps(self): - codenames = [ - get_user_permission_full_codename('change'), - 'contenttypes.change_contenttype', - ] - self.assertRaises(MixedContentTypeError, get_objects_for_user, - self.user, codenames) - - def test_mixed_perms_and_klass(self): - self.assertRaises(MixedContentTypeError, get_objects_for_user, - self.user, ['auth.change_group'], User) - - def test_no_app_label_nor_klass(self): - self.assertRaises(WrongAppError, get_objects_for_user, self.user, - ['change_group']) - - def test_empty_perms_sequence(self): - self.assertEqual( - set(get_objects_for_user(self.user, [], Group.objects.all())), - set() - ) - - def test_perms_single(self): - perm = 'auth.change_group' - assign_perm(perm, self.user, self.group) - self.assertEqual( - set(get_objects_for_user(self.user, perm)), - set(get_objects_for_user(self.user, [perm]))) - - def test_klass_as_model(self): - assign_perm('contenttypes.change_contenttype', self.user, self.ctype) - - objects = get_objects_for_user(self.user, - ['contenttypes.change_contenttype'], ContentType) - self.assertEqual([obj.name for obj in objects], [self.ctype.name]) - - def test_klass_as_manager(self): - assign_perm('auth.change_group', self.user, self.group) - objects = get_objects_for_user(self.user, ['auth.change_group'], - Group.objects) - self.assertEqual([obj.name for obj in objects], [self.group.name]) - - def test_klass_as_queryset(self): - assign_perm('auth.change_group', self.user, self.group) - objects = get_objects_for_user(self.user, ['auth.change_group'], - Group.objects.all()) - self.assertEqual([obj.name for obj in objects], [self.group.name]) - - def test_ensure_returns_queryset(self): - objects = get_objects_for_user(self.user, ['auth.change_group']) - self.assertTrue(isinstance(objects, QuerySet)) - - def test_simple(self): - group_names = ['group1', 'group2', 'group3'] - groups = [Group.objects.create(name=name) for name in group_names] - for group in groups: - assign_perm('change_group', self.user, group) - - objects = get_objects_for_user(self.user, ['auth.change_group']) - self.assertEqual(len(objects), len(groups)) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual( - set(objects), - set(groups)) - - def test_multiple_perms_to_check(self): - group_names = ['group1', 'group2', 'group3'] - groups = [Group.objects.create(name=name) for name in group_names] - for group in groups: - assign_perm('auth.change_group', self.user, group) - assign_perm('auth.delete_group', self.user, groups[1]) - - objects = get_objects_for_user(self.user, ['auth.change_group', - 'auth.delete_group']) - self.assertEqual(len(objects), 1) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual( - set(objects.values_list('name', flat=True)), - set([groups[1].name])) - - def test_any_of_multiple_perms_to_check(self): - group_names = ['group1', 'group2', 'group3'] - groups = [Group.objects.create(name=name) for name in group_names] - assign_perm('auth.change_group', self.user, groups[0]) - assign_perm('auth.delete_group', self.user, groups[2]) - - objects = get_objects_for_user(self.user, ['auth.change_group', - 'auth.delete_group'], any_perm=True) - self.assertEqual(len(objects), 2) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual( - set(objects.values_list('name', flat=True)), - set([groups[0].name, groups[2].name])) - - def test_groups_perms(self): - group1 = Group.objects.create(name='group1') - group2 = Group.objects.create(name='group2') - group3 = Group.objects.create(name='group3') - groups = [group1, group2, group3] - for group in groups: - self.user.groups.add(group) - - # Objects to operate on - ctypes = dict(((ct.id, ct) for ct in ContentType.objects.all())) - - assign_perm('change_contenttype', self.user, ctypes[1]) - assign_perm('change_contenttype', self.user, ctypes[2]) - assign_perm('delete_contenttype', self.user, ctypes[2]) - assign_perm('delete_contenttype', self.user, ctypes[3]) - - assign_perm('change_contenttype', groups[0], ctypes[4]) - assign_perm('change_contenttype', groups[1], ctypes[4]) - assign_perm('change_contenttype', groups[2], ctypes[5]) - assign_perm('delete_contenttype', groups[0], ctypes[1]) - - objects = get_objects_for_user(self.user, - ['contenttypes.change_contenttype']) - self.assertEqual( - set(objects.values_list('id', flat=True)), - set([1, 2, 4, 5])) - - objects = get_objects_for_user(self.user, - ['contenttypes.change_contenttype', - 'contenttypes.delete_contenttype']) - self.assertEqual( - set(objects.values_list('id', flat=True)), - set([1, 2])) - - objects = get_objects_for_user(self.user, - ['contenttypes.change_contenttype']) - self.assertEqual( - set(objects.values_list('id', flat=True)), - set([1, 2, 4, 5])) - -class GetObjectsForGroup(TestCase): - """ - Tests get_objects_for_group function. - """ - def setUp(self): - self.obj1 = ContentType.objects.create(name='ct1', model='foo', - app_label='guardian-tests') - self.obj2 = ContentType.objects.create(name='ct2', model='bar', - app_label='guardian-tests') - self.obj3 = ContentType.objects.create(name='ct3', model='baz', - app_label='guardian-tests') - self.user1 = User.objects.create(username='user1') - self.user2 = User.objects.create(username='user2') - self.user3 = User.objects.create(username='user3') - self.group1 = Group.objects.create(name='group1') - self.group2 = Group.objects.create(name='group2') - self.group3 = Group.objects.create(name='group3') - - def test_mixed_perms(self): - codenames = [ - get_user_permission_full_codename('change'), - 'auth.change_permission', - ] - self.assertRaises(MixedContentTypeError, get_objects_for_group, - self.group1, codenames) - - def test_perms_with_mixed_apps(self): - codenames = [ - get_user_permission_full_codename('change'), - 'contenttypes.contenttypes.change_contenttype', - ] - self.assertRaises(MixedContentTypeError, get_objects_for_group, - self.group1, codenames) - - def test_mixed_perms_and_klass(self): - self.assertRaises(MixedContentTypeError, get_objects_for_group, - self.group1, ['auth.change_group'], User) - - def test_no_app_label_nor_klass(self): - self.assertRaises(WrongAppError, get_objects_for_group, self.group1, - ['change_contenttype']) - - def test_empty_perms_sequence(self): - self.assertEqual( - set(get_objects_for_group(self.group1, [], ContentType)), - set() - ) - - def test_perms_single(self): - perm = 'contenttypes.change_contenttype' - assign_perm(perm, self.group1, self.obj1) - self.assertEqual( - set(get_objects_for_group(self.group1, perm)), - set(get_objects_for_group(self.group1, [perm])) - ) - - def test_klass_as_model(self): - assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) - - objects = get_objects_for_group(self.group1, - ['contenttypes.change_contenttype'], ContentType) - self.assertEqual([obj.name for obj in objects], [self.obj1.name]) - - def test_klass_as_manager(self): - assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) - objects = get_objects_for_group(self.group1, ['change_contenttype'], - ContentType.objects) - self.assertEqual(list(objects), [self.obj1]) - - def test_klass_as_queryset(self): - assign_perm('contenttypes.change_contenttype', self.group1, self.obj1) - objects = get_objects_for_group(self.group1, ['change_contenttype'], - ContentType.objects.all()) - self.assertEqual(list(objects), [self.obj1]) - - def test_ensure_returns_queryset(self): - objects = get_objects_for_group(self.group1, ['contenttypes.change_contenttype']) - self.assertTrue(isinstance(objects, QuerySet)) - - def test_simple(self): - assign_perm('change_contenttype', self.group1, self.obj1) - assign_perm('change_contenttype', self.group1, self.obj2) - - objects = get_objects_for_group(self.group1, 'contenttypes.change_contenttype') - self.assertEqual(len(objects), 2) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual( - set(objects), - set([self.obj1, self.obj2])) - - def test_simple_after_removal(self): - self.test_simple() - remove_perm('change_contenttype', self.group1, self.obj1) - objects = get_objects_for_group(self.group1, 'contenttypes.change_contenttype') - self.assertEqual(len(objects), 1) - self.assertEqual(objects[0], self.obj2) - - def test_multiple_perms_to_check(self): - assign_perm('change_contenttype', self.group1, self.obj1) - assign_perm('delete_contenttype', self.group1, self.obj1) - assign_perm('change_contenttype', self.group1, self.obj2) - - objects = get_objects_for_group(self.group1, [ - 'contenttypes.change_contenttype', - 'contenttypes.delete_contenttype']) - self.assertEqual(len(objects), 1) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual(objects[0], self.obj1) - - def test_any_of_multiple_perms_to_check(self): - assign_perm('change_contenttype', self.group1, self.obj1) - assign_perm('delete_contenttype', self.group1, self.obj1) - assign_perm('add_contenttype', self.group1, self.obj2) - assign_perm('delete_contenttype', self.group1, self.obj3) - - objects = get_objects_for_group(self.group1, - ['contenttypes.change_contenttype', - 'contenttypes.delete_contenttype'], any_perm=True) - self.assertTrue(isinstance(objects, QuerySet)) - self.assertEqual([obj for obj in objects.order_by('name')], - [self.obj1, self.obj3]) - - def test_results_for_different_groups_are_correct(self): - assign_perm('change_contenttype', self.group1, self.obj1) - assign_perm('delete_contenttype', self.group2, self.obj2) - - self.assertEqual(set(get_objects_for_group(self.group1, 'contenttypes.change_contenttype')), - set([self.obj1])) - self.assertEqual(set(get_objects_for_group(self.group2, 'contenttypes.change_contenttype')), - set()) - self.assertEqual(set(get_objects_for_group(self.group2, 'contenttypes.delete_contenttype')), - set([self.obj2])) - diff -Nru django-guardian-1.1.1/guardian/tests/tags_test.py django-guardian-1.2.0/guardian/tests/tags_test.py --- django-guardian-1.1.1/guardian/tests/tags_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/tags_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -from __future__ import unicode_literals -from django.conf import settings -from django.contrib.auth.models import Group, AnonymousUser -from django.contrib.contenttypes.models import ContentType -from django.template import Template, Context, TemplateSyntaxError -from django.test import TestCase - -from guardian.compat import get_user_model -from guardian.exceptions import NotUserNorGroup -from guardian.models import UserObjectPermission, GroupObjectPermission - -User = get_user_model() - -def render(template, context): - """ - Returns rendered ``template`` with ``context``, which are given as string - and dict respectively. - """ - t = Template(template) - return t.render(Context(context)) - -class GetObjPermsTagTest(TestCase): - - def setUp(self): - self.ctype = ContentType.objects.create(name='foo', model='bar', - app_label='fake-for-guardian-tests') - self.group = Group.objects.create(name='jackGroup') - self.user = User.objects.create(username='jack') - self.user.groups.add(self.group) - - def test_wrong_formats(self): - wrong_formats = ( - '{% get_obj_perms user for contenttype as obj_perms %}', # no quotes - '{% get_obj_perms user for contenttype as \'obj_perms" %}', # wrong quotes - '{% get_obj_perms user for contenttype as \'obj_perms" %}', # wrong quotes - '{% get_obj_perms user for contenttype as obj_perms" %}', # wrong quotes - '{% get_obj_perms user for contenttype as obj_perms\' %}', # wrong quotes - '{% get_obj_perms user for contenttype as %}', # no context_var - '{% get_obj_perms for contenttype as "obj_perms" %}', # no user/group - '{% get_obj_perms user contenttype as "obj_perms" %}', # no "for" bit - '{% get_obj_perms user for contenttype "obj_perms" %}', # no "as" bit - '{% get_obj_perms user for as "obj_perms" %}', # no object - ) - - context = {'user': User.get_anonymous(), 'contenttype': self.ctype} - for wrong in wrong_formats: - fullwrong = '{% load guardian_tags %}' + wrong - try: - render(fullwrong, context) - self.fail("Used wrong get_obj_perms tag format: \n\n\t%s\n\n " - "but TemplateSyntaxError have not been raised" % wrong) - except TemplateSyntaxError: - pass - - def test_anonymous_user(self): - template = ''.join(( - '{% load guardian_tags %}', - '{% get_obj_perms user for contenttype as "obj_perms" %}{{ perms }}', - )) - context = {'user': AnonymousUser(), 'contenttype': self.ctype} - anon_output = render(template, context) - context = {'user': User.get_anonymous(), 'contenttype': self.ctype} - real_anon_user_output = render(template, context) - self.assertEqual(anon_output, real_anon_user_output) - - def test_wrong_user_or_group(self): - template = ''.join(( - '{% load guardian_tags %}', - '{% get_obj_perms some_obj for contenttype as "obj_perms" %}', - )) - context = {'some_obj': ContentType(), 'contenttype': self.ctype} - # This test would raise TemplateSyntaxError instead of NotUserNorGroup - # if TEMPLATE_DEBUG is set to True during tests - tmp = settings.TEMPLATE_DEBUG - settings.TEMPLATE_DEBUG = False - self.assertRaises(NotUserNorGroup, render, template, context) - settings.TEMPLATE_DEBUG = tmp - - def test_superuser(self): - user = User.objects.create(username='superuser', is_superuser=True) - template = ''.join(( - '{% load guardian_tags %}', - '{% get_obj_perms user for contenttype as "obj_perms" %}', - '{{ obj_perms|join:" " }}', - )) - context = {'user': user, 'contenttype': self.ctype} - output = render(template, context) - - for perm in ('add_contenttype', 'change_contenttype', 'delete_contenttype'): - self.assertTrue(perm in output) - - def test_user(self): - UserObjectPermission.objects.assign_perm("change_contenttype", self.user, - self.ctype) - GroupObjectPermission.objects.assign_perm("delete_contenttype", self.group, - self.ctype) - - template = ''.join(( - '{% load guardian_tags %}', - '{% get_obj_perms user for contenttype as "obj_perms" %}', - '{{ obj_perms|join:" " }}', - )) - context = {'user': self.user, 'contenttype': self.ctype} - output = render(template, context) - - self.assertEqual( - set(output.split(' ')), - set('change_contenttype delete_contenttype'.split(' '))) - - def test_group(self): - GroupObjectPermission.objects.assign_perm("delete_contenttype", self.group, - self.ctype) - - template = ''.join(( - '{% load guardian_tags %}', - '{% get_obj_perms group for contenttype as "obj_perms" %}', - '{{ obj_perms|join:" " }}', - )) - context = {'group': self.group, 'contenttype': self.ctype} - output = render(template, context) - - self.assertEqual(output, 'delete_contenttype') - diff -Nru django-guardian-1.1.1/guardian/tests/templates/dummy403.html django-guardian-1.2.0/guardian/tests/templates/dummy403.html --- django-guardian-1.1.1/guardian/tests/templates/dummy403.html 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/templates/dummy403.html 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -foobar403 diff -Nru django-guardian-1.1.1/guardian/tests/testapp/__init__.py django-guardian-1.2.0/guardian/tests/testapp/__init__.py --- django-guardian-1.1.1/guardian/tests/testapp/__init__.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/testapp/__init__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -from __future__ import unicode_literals - diff -Nru django-guardian-1.1.1/guardian/tests/testapp/models.py django-guardian-1.2.0/guardian/tests/testapp/models.py --- django-guardian-1.1.1/guardian/tests/testapp/models.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/testapp/models.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -from __future__ import unicode_literals -from datetime import datetime -from django.db import models -from django.contrib.admin.models import LogEntry -from guardian.models import UserObjectPermissionBase, GroupObjectPermissionBase - - -class ProjectUserObjectPermission(UserObjectPermissionBase): - content_object = models.ForeignKey('Project') - - -class ProjectGroupObjectPermission(GroupObjectPermissionBase): - content_object = models.ForeignKey('Project') - - -class Project(models.Model): - name = models.CharField(max_length=128, unique=True) - created_at = models.DateTimeField(default=datetime.now) - - class Meta: - get_latest_by = 'created_at' - - def __unicode__(self): - return self.name - - -class MixedGroupObjectPermission(GroupObjectPermissionBase): - content_object = models.ForeignKey('Mixed') - - -class Mixed(models.Model): - """ - Model for tests obj perms checks with generic user object permissions model - and direct group object permissions model. - """ - name = models.CharField(max_length=128, unique=True) - - def __unicode__(self): - return self.name - - -class LogEntryWithGroup(LogEntry): - group = models.ForeignKey('auth.Group', null=True, blank=True) - diff -Nru django-guardian-1.1.1/guardian/tests/urls.py django-guardian-1.2.0/guardian/tests/urls.py --- django-guardian-1.1.1/guardian/tests/urls.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/urls.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -from __future__ import unicode_literals -# handler404 and handler500 are needed for admin tests -from guardian.compat import include, patterns, handler404, handler500 # pyflakes:ignore -from django.contrib import admin - -admin.autodiscover() - -urlpatterns = patterns('', - (r'^admin/', include(admin.site.urls)), -) - - diff -Nru django-guardian-1.1.1/guardian/tests/utils_test.py django-guardian-1.2.0/guardian/tests/utils_test.py --- django-guardian-1.1.1/guardian/tests/utils_test.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/tests/utils_test.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -from __future__ import unicode_literals -from django.test import TestCase -from django.contrib.contenttypes.models import ContentType -from django.contrib.auth.models import Group, AnonymousUser -from django.db import models - -from guardian.compat import get_user_model -from guardian.tests.core_test import ObjectPermissionTestCase -from guardian.tests.testapp.models import Project -from guardian.tests.testapp.models import ProjectUserObjectPermission -from guardian.tests.testapp.models import ProjectGroupObjectPermission -from guardian.models import UserObjectPermission -from guardian.models import UserObjectPermissionBase -from guardian.models import GroupObjectPermission -from guardian.utils import get_anonymous_user -from guardian.utils import get_identity -from guardian.utils import get_user_obj_perms_model -from guardian.utils import get_group_obj_perms_model -from guardian.utils import get_obj_perms_model -from guardian.exceptions import NotUserNorGroup - -User = get_user_model() - -class GetAnonymousUserTest(TestCase): - - def test(self): - anon = get_anonymous_user() - self.assertTrue(isinstance(anon, User)) - -class GetIdentityTest(ObjectPermissionTestCase): - - def test_user(self): - user, group = get_identity(self.user) - self.assertTrue(isinstance(user, User)) - self.assertEqual(group, None) - - def test_anonymous_user(self): - anon = AnonymousUser() - user, group = get_identity(anon) - self.assertTrue(isinstance(user, User)) - self.assertEqual(group, None) - - def test_group(self): - user, group = get_identity(self.group) - self.assertTrue(isinstance(group, Group)) - self.assertEqual(user, None) - - def test_not_user_nor_group(self): - self.assertRaises(NotUserNorGroup, get_identity, 1) - self.assertRaises(NotUserNorGroup, get_identity, "User") - self.assertRaises(NotUserNorGroup, get_identity, User) - - -class GetUserObjPermsModelTest(TestCase): - - def test_for_instance(self): - project = Project(name='Foobar') - self.assertEqual(get_user_obj_perms_model(project), - ProjectUserObjectPermission) - - def test_for_class(self): - self.assertEqual(get_user_obj_perms_model(Project), - ProjectUserObjectPermission) - - def test_default(self): - self.assertEqual(get_user_obj_perms_model(ContentType), - UserObjectPermission) - - def test_user_model(self): - # this test assumes that there were no direct obj perms model to User - # model defined (i.e. while testing guardian app in some custom project) - self.assertEqual(get_user_obj_perms_model(User), - UserObjectPermission) - - -class GetGroupObjPermsModelTest(TestCase): - - def test_for_instance(self): - project = Project(name='Foobar') - self.assertEqual(get_group_obj_perms_model(project), - ProjectGroupObjectPermission) - - def test_for_class(self): - self.assertEqual(get_group_obj_perms_model(Project), - ProjectGroupObjectPermission) - - def test_default(self): - self.assertEqual(get_group_obj_perms_model(ContentType), - GroupObjectPermission) - - def test_group_model(self): - # this test assumes that there were no direct obj perms model to Group - # model defined (i.e. while testing guardian app in some custom project) - self.assertEqual(get_group_obj_perms_model(Group), - GroupObjectPermission) - -class GetObjPermsModelTest(TestCase): - - def test_image_field(self): - - class SomeModel(models.Model): - image = models.ImageField(upload_to='images/') - - obj = SomeModel() - perm_model = get_obj_perms_model(obj, UserObjectPermissionBase, - UserObjectPermission) - self.assertEqual(perm_model, UserObjectPermission) - - def test_file_field(self): - - class SomeModel(models.Model): - file = models.FileField(upload_to='images/') - - obj = SomeModel() - perm_model = get_obj_perms_model(obj, UserObjectPermissionBase, - UserObjectPermission) - self.assertEqual(perm_model, UserObjectPermission) - diff -Nru django-guardian-1.1.1/guardian/testsettings.py django-guardian-1.2.0/guardian/testsettings.py --- django-guardian-1.1.1/guardian/testsettings.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/testsettings.py 2014-07-22 09:46:49.000000000 +0000 @@ -14,7 +14,7 @@ 'django.contrib.admin', 'django.contrib.messages', 'guardian', - 'guardian.tests.testapp', + 'guardian.testapp', ) AUTHENTICATION_BACKENDS = ( @@ -32,7 +32,7 @@ }, } -ROOT_URLCONF = 'guardian.tests.urls' +ROOT_URLCONF = 'guardian.testapp.tests.urls' SITE_ID = 1 TEMPLATE_DIRS = ( diff -Nru django-guardian-1.1.1/guardian/utils.py django-guardian-1.2.0/guardian/utils.py --- django-guardian-1.1.1/guardian/utils.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/guardian/utils.py 2014-07-22 09:46:49.000000000 +0000 @@ -50,6 +50,7 @@ **Examples**:: + >>> from django.contrib.auth.models import User >>> user = User.objects.create(username='joe') >>> get_identity(user) (, None) @@ -147,24 +148,17 @@ if isinstance(obj, Model): obj = obj.__class__ ctype = ContentType.objects.get_for_model(obj) - for name in dir(obj): - try: - attr = getattr(obj, name) - except AttributeError: - # this might be thrown if field is a FileField - continue - if hasattr(attr, 'related'): - related = attr.related - model = getattr(related, 'model', None) - if (model and issubclass(model, base_cls) and - model is not generic_cls): - # if model is generic one it would be returned anyway - if not model.objects.is_generic(): - # make sure that content_object's content_type is same as - # the one of given obj - fk = model._meta.get_field_by_name('content_object')[0] - if ctype == ContentType.objects.get_for_model(fk.rel.to): - return model + for attr in obj._meta.get_all_related_objects(): + model = getattr(attr, 'model', None) + if (model and issubclass(model, base_cls) and + model is not generic_cls): + # if model is generic one it would be returned anyway + if not model.objects.is_generic(): + # make sure that content_object's content_type is same as + # the one of given obj + fk = model._meta.get_field_by_name('content_object')[0] + if ctype == ContentType.objects.get_for_model(fk.rel.to): + return model return generic_cls diff -Nru django-guardian-1.1.1/MANIFEST.in django-guardian-1.2.0/MANIFEST.in --- django-guardian-1.1.1/MANIFEST.in 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/MANIFEST.in 2014-07-22 09:46:34.000000000 +0000 @@ -11,5 +11,6 @@ recursive-include guardian/templates *.html recursive-include guardian/tests/templates *.html recursive-include docs * -prune example_project -prune docs/build +recursive-exclude example_project * +recursive-exclude docs/build * +recursive-exclude benchmarks * diff -Nru django-guardian-1.1.1/README.rst django-guardian-1.2.0/README.rst --- django-guardian-1.1.1/README.rst 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/README.rst 2014-07-22 09:46:34.000000000 +0000 @@ -5,6 +5,15 @@ .. image:: https://secure.travis-ci.org/lukaszb/django-guardian.png?branch=master :target: http://travis-ci.org/lukaszb/django-guardian +.. image:: https://coveralls.io/repos/lukaszb/django-guardian/badge.png?branch=master + :target: https://coveralls.io/r/lukaszb/django-guardian/ + +.. image:: https://pypip.in/v/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + +.. image:: https://pypip.in/d/django-guardian/badge.png + :target: https://crate.io/packages/django-guardian/ + ``django-guardian`` is implementation of per object permissions [1]_ as authorization backend which is supported since Django_ 1.2. It won't @@ -13,9 +22,7 @@ Documentation ------------- -Online documentation is available at - -http://packages.python.org/django-guardian/ or http://django-guardian.rtfd.org/ +Online documentation is available at http://django-guardian.rtfd.org/. Installation ------------ @@ -95,5 +102,5 @@ .. [1] Great paper about this feature is available at `djangoadvent articles `_. -.. _Django: http://www.djangoproject.org/ +.. _Django: http://www.djangoproject.com/ diff -Nru django-guardian-1.1.1/setup.cfg django-guardian-1.2.0/setup.cfg --- django-guardian-1.1.1/setup.cfg 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/setup.cfg 2014-07-22 09:46:34.000000000 +0000 @@ -8,3 +8,6 @@ [bdist_rpm] requires = Django >= 1.2 + +[wheel] +universal = 1 diff -Nru django-guardian-1.1.1/setup.py django-guardian-1.2.0/setup.py --- django-guardian-1.1.1/setup.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/setup.py 2014-07-22 09:46:34.000000000 +0000 @@ -12,10 +12,13 @@ "``long_description`` (%s)\n" % readme_file) sys.exit(1) +tests_require = ['mock'] + +extra_kwargs = {} if sys.version_info >= (3,): extra_kwargs = {'use_2to3': True} -else: - extra_kwargs = {} +elif sys.version_info < (2, 7): + tests_require.append('unittest2') setup( name = 'django-guardian', @@ -31,11 +34,10 @@ include_package_data = True, license = 'BSD', install_requires = [ - 'Django>=1.2', - ], - tests_require = [ - 'mock', + 'Django', + 'six', ], + tests_require=tests_require, classifiers = ['Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', @@ -44,6 +46,8 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Security', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3', ], test_suite='tests.main', cmdclass={'flakes': RunFlakesCommand}, diff -Nru django-guardian-1.1.1/tests.py django-guardian-1.2.0/tests.py --- django-guardian-1.1.1/tests.py 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/tests.py 2014-07-22 09:46:34.000000000 +0000 @@ -8,6 +8,7 @@ """ import os import sys +import django os.environ["DJANGO_SETTINGS_MODULE"] = 'guardian.testsettings' from guardian import testsettings as settings @@ -19,7 +20,11 @@ 'django.contrib.admin', 'django.contrib.sites', 'guardian', - 'guardian.tests.testapp', + 'guardian.testapp', +) +settings.PASSWORD_HASHERS = ( + 'django.contrib.auth.hashers.MD5PasswordHasher', + 'django.contrib.auth.hashers.SHA1PasswordHasher', ) def run_tests(settings): @@ -28,9 +33,13 @@ show_settings(settings, 'tests') + import django + if hasattr(django, 'setup'): + django.setup() + TestRunner = get_runner(settings) test_runner = TestRunner(interactive=False) - failures = test_runner.run_tests(['auth', 'guardian']) + failures = test_runner.run_tests(['auth', 'guardian', 'testapp']) return failures def main(): diff -Nru django-guardian-1.1.1/tox.ini django-guardian-1.2.0/tox.ini --- django-guardian-1.1.1/tox.ini 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/tox.ini 2014-07-22 09:46:34.000000000 +0000 @@ -3,42 +3,48 @@ envlist = py26, py26-grappelli, - py26-django12-grappelli, py26-django12, py26-django13, py26-django14, py26-django15, py27, py27-grappelli, - py27-django12-grappelli, py27-django12, py27-django13, py27-django14, py27-django15, + py27-django16, + py27-django17, py33-django15, + py33-django16, + py33-django17, + custom-user-model, + no-tests-app, migrations, - migrations-django15, - docs, + docs27, + docs33, flakes, + [testenv] commands = python setup.py test deps = - django==1.4.5 + django==1.5.5 mock>=0.7.2 [testenv:mysql] setenv = GUARDIAN_TEST_DB_BACKEND=mysql deps = - django==1.3.7 + django==1.6.2 MySQL-python==1.2.3 [testenv:postgresql] +basepython = python2.7 setenv = GUARDIAN_TEST_DB_BACKEND=postgresql deps = - django==1.3.7 + django==1.6.2 psycopg2==2.4.1 # psycopg2==2.4.2 has troubles with test runner, see: https://code.djangoproject.com/ticket/16250 @@ -49,10 +55,16 @@ deps = django==1.3.7 [django14] -deps = django==1.4.5 +deps = django==1.4.10 [django15] -deps = django==1.5.1 +deps = django==1.5.5 + +[django16] +deps = django==1.6.2 + +[django17] +deps = https://www.djangoproject.com/m/releases/1.7/Django-1.7a2.tar.gz [testenv:py26-grappelli] @@ -77,12 +89,6 @@ basepython = python2.6 deps = {[django15]deps} -[testenv:py26-django12-grappelli] -basepython = python2.6 -deps = - {[django12]deps} - django-grappelli==2.3.5 - [testenv:py27-grappelli] basepython = python2.7 deps = @@ -105,32 +111,43 @@ basepython = python2.7 deps = {[django15]deps} +[testenv:py27-django16] +basepython = python2.7 +deps = {[django16]deps} + +[testenv:py27-django17] +basepython = python2.7 +deps = {[django17]deps} + [testenv:py33-django15] basepython = python3.3 deps = {[django15]deps} -[testenv:py27-django12-grappelli] -basepython = python2.7 -deps = - {[django12]deps} - django-grappelli==2.3.5 +[testenv:py33-django16] +basepython = python3.3 +deps = {[django16]deps} -[testenv:migrations] -setenv = - GUARDIAN_TEST_SOUTH="yes" +[testenv:py33-django17] +basepython = python3.3 +deps = {[django17]deps} + +[testenv:custom-user-model] +basepython = python3.3 +deps = {[django16]deps} changedir = example_project -deps = - django==1.4.5 - mock - south commands = - ./.pre_test.sh - python manage.py syncdb --noinput - python manage.py migrationcheck - python manage.py test guardian - ./.post_test.sh + {envpython} manage.py test guardian integration_tests --traceback -[testenv:migrations-django15] +[testenv:no-tests-app] +basepython = python3.3 +deps = {[django16]deps} +changedir = example_project +setenv = + GUARDIAN_NO_TESTS_APP=yes +commands = + {envpython} manage.py test guardian + +[testenv:migrations] setenv = GUARDIAN_TEST_SOUTH="yes" changedir = example_project @@ -139,17 +156,27 @@ mock south commands = - ./.pre_test.sh python manage.py syncdb --noinput python manage.py migrationcheck python manage.py test guardian --traceback - ./.post_test.sh -[testenv:docs] +[testenv:docs27] +basepython = python2.7 changedir = docs deps = sphinx + mock + {[django16]deps} +commands = + sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + +[testenv:docs33] +basepython = python3.3 +changedir = docs +deps = + sphinx + {[django16]deps} commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html @@ -160,7 +187,3 @@ commands = python setup.py flakes -[testenv:example] -changedir = example_project -commands = python manage.py test guardian --failfast --traceback - diff -Nru django-guardian-1.1.1/.travis.yml django-guardian-1.2.0/.travis.yml --- django-guardian-1.1.1/.travis.yml 2013-05-31 13:49:35.000000000 +0000 +++ django-guardian-1.2.0/.travis.yml 2014-07-22 09:46:34.000000000 +0000 @@ -2,20 +2,36 @@ python: - 2.6 - 2.7 + - 3.3 env: - DJANGO_VERSION=1.2.7 - DJANGO_VERSION=1.3.7 - - DJANGO_VERSION=1.4.5 - - DJANGO_VERSION=1.5.1 + - DJANGO_VERSION=1.4.10 + - DJANGO_VERSION=1.5.5 + - DJANGO_VERSION=1.6.2 install: - - pip install -q mock==0.8 django-grappelli==2.3.8 Django==$DJANGO_VERSION + - pip install -q mock==0.8 Django==$DJANGO_VERSION coverage coveralls - pip install . --use-mirrors -script: python setup.py test +script: + - coverage run --source=guardian setup.py test +after_success: + - coverage report --omit "guardian/compat.py,guardian/testsettings.py" -m guardian/*.py + - coveralls notifications: irc: "irc.freenode.net#django-guardian" + +matrix: + exclude: + - python: 3.3 + env: DJANGO_VERSION=1.2.7 + - python: 3.3 + env: DJANGO_VERSION=1.3.7 + - python: 3.3 + env: DJANGO_VERSION=1.4.10 +