Change license and version

README.rst

@@ -202,7 +202,7 @@ Additional information
 
 Fork the project on GitHub : https://github.com/Star2Billing/newfies-dialer
 
-License : AGPL (https://raw.github.com/Star2Billing/newfies-dialer/master/COPYING)
+License : MPL 2.0 (https://raw.github.com/Star2Billing/newfies-dialer/master/COPYING)
 
 Website : http://www.newfies-dialer.org
 

docs/source/includes/resources.txt

@@ -46,7 +46,7 @@ Be sure to also read the :ref:`contributing` section in the documentation.
 License
 =======
 
-This software is licensed under the `AGPL License`. See the :file:`LICENSE`
+This software is licensed under the `MPL 2.0 License`. See the :file:`LICENSE`
 file in the top distribution directory for the full license text.
 
 .. # vim: syntax=rst expandtab tabstop=4 shiftwidth=4 shiftround

newfies/__init__.py

@@ -1,9 +1,23 @@
 # -*- coding: utf-8 -*-
-"""Autodialer & Voice Broadcast Application"""
+
+#
+# Newfies-Dialer License
+# http://www.newfies-dialer.org
+#
+# This Source Code Form is subject to the terms of the Mozilla Public 
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright (C) 2011-2012 Star2Billing S.L.
+# 
+# The Initial Developer of the Original Code is
+# Arezqui Belaid <[email protected]>
+#
+
 # :copyright: (c) 2011 - 2012 by Arezqui Belaid.
-# :license: AGPL, see COPYING for more details.
+# :license: MPL 2.0, see COPYING for more details.
 
-VERSION = (1, 1, 1, "")
+VERSION = (1, 2, 0, "beta")
 __version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
 __author__ = "Arezqui Belaid"
 __contact__ = "[email protected]"

newfies/custom_admin_tools/menu.py

@@ -6,15 +6,15 @@
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from admin_tools.menu import items, Menu
-
+import newfies
 
 class CustomMenu(Menu):
     """Custom Menu for admin site."""
 
     def __init__(self, **kwargs):
         Menu.__init__(self, **kwargs)
         self.children += [
-            items.MenuItem(_('Newfies-Dialer Dashboard'), reverse('admin:index')),
+            items.MenuItem(_('Newfies-Dialer' + ' V' + newfies.__version__), reverse('admin:index')),
             items.Bookmarks(),
             items.AppList(
                 _('Applications'),

newfies/templates/admin/base_site.html

@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 {% load i18n admin_tools_menu_tags %}
 
-{% block title %}{% trans 'Newfies Admin' %}{% endblock %}
+{% block title %}{% trans 'Newfies-Dialer Admin' %}{% endblock %}
 {% block extrahead %}
 <link rel="icon" type="image/png" href="{{STATIC_URL}}newfies/images/favicon.png">
 <!-- jquery UI css -->
@@ -17,6 +17,21 @@
 <script src="{{STATIC_URL}}newfies/js/jquery.flot.stack.js" type="text/javascript"></script>
 <style>
 
+<!--
+   - Newfies-Dialer License
+   - http://www.newfies-dialer.org
+   - 
+   - This Source Code Form is subject to the terms of the Mozilla Public 
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file, 
+   - You can obtain one at http://mozilla.org/MPL/2.0/.
+   - 
+   - Copyright (C) 2011-2012 Star2Billing S.L.
+   - 
+   - The Initial Developer of the Original Code is
+   - Arezqui Belaid <[email protected]>
+   -
+-->
+
 #header #bookmark-button {
 right:280px;!important;
 }

newfies/templates/frontend/footer.html

@@ -0,0 +1,4 @@
+
+    <footer>
+        <p>Powered by Newfies-Dialer - <a href="http://www.newfies-dialer.org/" target="_blank">Auto-Dialer and Voice Broadcasting Software</a></p>
+    </footer>

newfies/templates/frontend/index.html

@@ -23,8 +23,8 @@ <h2>Support</h2>
           </div>
           <div class="span7 offset1">
             <h2>Licensing</h2>
-             <p>{% trans "Newfies-Dialer is licensed under" %} <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>,
-        {% trans "however an alternative license can be purchased if the AGPL license is not suitable for your requirements." %}</p>
+             <p>{% trans "Newfies-Dialer is licensed under" %} <a href="http://www.mozilla.org/MPL/2.0/" target="_blank">MPL V2</a>,
+                {% trans "however an alternative license can be purchased if the MPL V2 license is not suitable for your requirements." %}</p>
             <p><a class="btn" href="http://www.newfies-dialer.org/support/licensing/">View Licensing details &raquo;</a></p>
          </div>
         </div>

newfies/templates/frontend/master.html

@@ -2,6 +2,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <head xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}">
 
+<!--
+- Newfies-Dialer License
+- http://www.newfies-dialer.org
+- 
+- This Source Code Form is subject to the terms of the Mozilla Public 
+- License, v. 2.0. If a copy of the MPL was not distributed with this file, 
+- You can obtain one at http://mozilla.org/MPL/2.0/.
+- 
+- Copyright (C) 2011-2012 Star2Billing S.L.
+- 
+- The Initial Developer of the Original Code is
+- Arezqui Belaid <[email protected]>
+-
+-->
+
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <title>{% block title %}Newfies-Dialer{% endblock %} | {% trans "Customer Interface" noop %}</title>
     <link rel="icon" type="image/png" href="{{STATIC_URL}}newfies/images/favicon.png">
@@ -125,12 +140,7 @@ <h1>Newfies-Dialer <small>{% trans "Voice Broadcasting solution" %}</small></h1>
         {% endblock %}
     </div>
 
-
-    <footer>
-        <p>Newfies-Dialer v{{ newfies_version }} {% trans "is" %} <a href="http://www.newfies-dialer.org/" target="_blank">{% trans "Autodialer software" %}</a> {% trans "licensed under the "  %}
-            <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>. <br/>
-            Copyright (C) 2010-2012 - Star2billing S.L. <a href="http://www.star2billing.com" target="_blank">http://www.star2billing.com</a></p>
-    </footer>
+{% include "frontend/footer.html" %}
 
 </div>
 

setup.py

@@ -95,13 +95,13 @@ def parse_dependency_links(file_name, install_flag=False):
     download_url='https://github.com/Star2Billing/newfies-dialer/tarball/master',
     packages=find_packages(),
     include_package_data=True,
-    license='AGPL License',
+    license='MPL 2.0 License',
     classifiers=[
         'Development Status :: 1 - Beta',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers, Users',
-        'License :: OSI Approved :: AGPL License',
+        'License :: OSI Approved :: MPL 2.0 License',
         'Operating System :: OS Independent',
         'Programming Language :: Python, Javascript, HTML',
         'Topic :: Voice Broadcast Software'