Changed license
This commit is contained in:
Marc Aymerich
parent
58c2e778c4
commit
5b54a0d28b
43
LICENSE
43
LICENSE
|
|
@ -1,14 +1,35 @@
|
||||||
Copyright (C) 2013 Marc Aymerich
|
Copyright (c) 2014 Marc Aymerich and individual contributors
|
||||||
|
All Rights Reserved.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
Django-orchestra is licensed under The BSD License (3 Clause, also known as
|
||||||
it under the terms of the GNU General Public License as published by
|
the new BSD license). The license is an OSI approved Open Source
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
license and is GPL-compatible(1).
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
The license text can also be found here:
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
http://www.opensource.org/licenses/BSD-3-Clause
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
Redistribution and use in source and binary forms, with or without
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
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 Ask Solem, 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 Ask Solem 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.
|
||||||
|
|
|
||||||
44
README.md
44
README.md
|
|
@ -76,18 +76,38 @@ If you are planing to do some development or perhaps just checking out this proj
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
Copyright (C) 2013 Marc Aymerich
|
Copyright (c) 2014 Marc Aymerich and individual contributors
|
||||||
|
All Rights Reserved.
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
Django-orchestra is licensed under The BSD License (3 Clause, also known as
|
||||||
it under the terms of the GNU General Public License as published by
|
the new BSD license). The license is an OSI approved Open Source
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
license and is GPL-compatible(1).
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
The license text can also be found here:
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
http://www.opensource.org/licenses/BSD-3-Clause
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
Redistribution and use in source and binary forms, with or without
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
modification, are permitted provided that the following conditions are met:
|
||||||
Status API Training Shop Blog About
|
|
||||||
|
* 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 Ask Solem, 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 Ask Solem 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.
|
||||||
|
|
|
||||||
|
|
@ -72,16 +72,9 @@ class WebAppAdmin(AccountAdminMixin, ExtendedModelAdmin):
|
||||||
""" Make value input widget bigger """
|
""" Make value input widget bigger """
|
||||||
if db_field.name == 'type':
|
if db_field.name == 'type':
|
||||||
# Help text based on select widget
|
# Help text based on select widget
|
||||||
kwargs['widget'] = forms.Select(attrs={
|
kwargs['widget'] = DynamicHelpTextSelect(
|
||||||
'onClick': """
|
'this.id.replace("name", "value")', self.TYPE_HELP_TEXT
|
||||||
siteoptions = %s;
|
)
|
||||||
valueelement = $("#"+this.id);
|
|
||||||
valueelement.parent().find('p').remove();
|
|
||||||
valueelement.parent().append(
|
|
||||||
"<p class='help'>" + siteoptions[this.options[this.selectedIndex].value] + "</p>"
|
|
||||||
);
|
|
||||||
""" % str(self.TYPE_HELP_TEXT),
|
|
||||||
})
|
|
||||||
kwargs['help_text'] = self.TYPE_HELP_TEXT.get(db_field.default, '')
|
kwargs['help_text'] = self.TYPE_HELP_TEXT.get(db_field.default, '')
|
||||||
return super(WebAppAdmin, self).formfield_for_dbfield(db_field, **kwargs)
|
return super(WebAppAdmin, self).formfield_for_dbfield(db_field, **kwargs)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue