diff --git a/authentic2/COPYING b/authentic2/COPYING index 718cb94..8116eba 100644 --- a/authentic2/COPYING +++ b/authentic2/COPYING @@ -1,2 +1,2 @@ -authentic2-plugin-template is entirely under the copyright of Entr'ouvert and +authentic2-auf is entirely under the copyright of Entr'ouvert and distributed under the license AGPLv3 or later. diff --git a/authentic2/MANIFEST.in b/authentic2/MANIFEST.in index 5f87890..b165710 100644 --- a/authentic2/MANIFEST.in +++ b/authentic2/MANIFEST.in @@ -1,3 +1,3 @@ include COPYING -recursive-include src/authentic2_plugin_template/templates *.html -recursive-include src/authentic2_plugin_template/static *.js *.css *.png +recursive-include src/authentic2_auf/templates *.html +recursive-include src/authentic2_auf/static *.js *.css *.png diff --git a/authentic2/README b/authentic2/README index 3688845..ecd6649 100644 --- a/authentic2/README +++ b/authentic2/README @@ -5,7 +5,7 @@ To rename it to your taste: $ ./adapt.sh ** THIS IS A TEMPLATE PROJECT ** -Authentic2 Plugin Template +Authentic2 Auf ========================== Install diff --git a/authentic2/adapt.sh b/authentic2/adapt.sh deleted file mode 100755 index d9fb451..0000000 --- a/authentic2/adapt.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -set -x - -echo "Give project name (it must match regexp ^[a-z][a-z0-9-]+$ )" -read PROJECT_NAME - -if ! echo $PROJECT_NAME | grep -q '^[a-z][a-z0-9-]\+$'; then - echo "Invalid project name:" $PROJECT_NAME - exit 1 -fi - -UPPER_UNDERSCORED=`echo $PROJECT_NAME | tr a-z A-Z | sed 's/-/_/g'` -LOWER_UNDERSCORED=`echo $PROJECT_NAME | sed 's/-/_/g'` -TITLECASE=`echo $PROJECT_NAME | sed 's/-/ /g;s/.*/\L&/; s/[a-z]*/\u&/g'` - -echo Project name: $PROJECT_NAME -echo Uppercase underscored: $UPPER_UNDERSCORED -echo Lowercase underscored: $LOWER_UNDERSCORED -echo Titlecase: $TITLECASE - -if [ -d .git ]; then - MV='git mv' -else - MV=mv -fi - -sed -i \ - -e "s/authentic2_plugin_template/$LOWER_UNDERSCORED/g" \ - -e "s/authentic2-plugin-template/$PROJECT_NAME/g" \ - -e "s/A2_TEMPLATE_/A2_$UPPER_UNDERSCORED_/g" \ - -e "s/Authentic2 Plugin Template/$TITLECASE/g" \ - setup.py src/*/*.py README COPYING MANIFEST.in -$MV src/authentic2_plugin_template/static/authentic2_plugin_template \ - src/authentic2_plugin_template/static/$LOWER_UNDERSCORED -$MV src/authentic2_plugin_template/templates/authentic2_plugin_template \ - src/authentic2_plugin_template/templates/$LOWER_UNDERSCORED -$MV src/authentic2_plugin_template src/$LOWER_UNDERSCORED diff --git a/authentic2/setup.py b/authentic2/setup.py index 0bb96e4..15df8e1 100755 --- a/authentic2/setup.py +++ b/authentic2/setup.py @@ -36,10 +36,10 @@ README = file(os.path.join( os.path.dirname(__file__), 'README')).read() -setup(name='authentic2-plugin-template', +setup(name='authentic2-auf', version=get_version(), license='AGPLv3', - description='Authentic2 Plugin Template', + description='Authentic2 Auf', long_description=README, author="Entr'ouvert", author_email="info@entrouvert.com", @@ -48,18 +48,19 @@ setup(name='authentic2-plugin-template', '': 'src', }, package_data={ - 'authentic2_plugin_template': [ - 'templates/authentic2_plugin_template/*.html', - 'static/authentic2_plugin_template/js/*.js', - 'static/authentic2_plugin_template/css/*.css', - 'static/authentic2_plugin_template/img/*.png', + 'authentic2_auf': [ + 'templates/authentic2_auf/*.html', + 'static/authentic2_auf/js/*.js', + 'static/authentic2_auf/css/*.css', + 'static/authentic2_auf/img/*.png', ], }, install_requires=[ + 'auf.django.secretquestions', ], entry_points={ 'authentic2.plugin': [ - 'authentic2-plugin-template= authentic2_plugin_template:Plugin', + 'authentic2-auf= authentic2_auf:Plugin', ], }, ) diff --git a/authentic2/src/authentic2_plugin_template/__init__.py b/authentic2/src/authentic2_auf/__init__.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/__init__.py rename to authentic2/src/authentic2_auf/__init__.py diff --git a/authentic2/src/authentic2_plugin_template/admin.py b/authentic2/src/authentic2_auf/admin.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/admin.py rename to authentic2/src/authentic2_auf/admin.py diff --git a/authentic2/src/authentic2_plugin_template/app_settings.py b/authentic2/src/authentic2_auf/app_settings.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/app_settings.py rename to authentic2/src/authentic2_auf/app_settings.py diff --git a/authentic2/src/authentic2_plugin_template/dashboard.py b/authentic2/src/authentic2_auf/dashboard.py similarity index 60% rename from authentic2/src/authentic2_plugin_template/dashboard.py rename to authentic2/src/authentic2_auf/dashboard.py index 48882ba..75e0b23 100644 --- a/authentic2/src/authentic2_plugin_template/dashboard.py +++ b/authentic2/src/authentic2_auf/dashboard.py @@ -5,7 +5,7 @@ from admin_tools.dashboard import modules def get_admin_modules(): '''Show Client model in authentic2 admin''' - model_list = modules.ModelList(_('Authentic2 Plugin Template'), - models=('authentic2_plugin_template.models.*',)) + model_list = modules.ModelList(_('Authentic2 Auf'), + models=('authentic2_auf.models.*',)) return (model_list,) diff --git a/authentic2/src/authentic2_plugin_template/forms.py b/authentic2/src/authentic2_auf/forms.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/forms.py rename to authentic2/src/authentic2_auf/forms.py diff --git a/authentic2/src/authentic2_plugin_template/migrations/__init__.py b/authentic2/src/authentic2_auf/migrations/__init__.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/migrations/__init__.py rename to authentic2/src/authentic2_auf/migrations/__init__.py diff --git a/authentic2/src/authentic2_plugin_template/models.py b/authentic2/src/authentic2_auf/models.py similarity index 100% rename from authentic2/src/authentic2_plugin_template/models.py rename to authentic2/src/authentic2_auf/models.py diff --git a/authentic2/src/authentic2_plugin_template/static/authentic2_plugin_template/.keepme b/authentic2/src/authentic2_auf/static/authentic2_auf/.keepme similarity index 100% rename from authentic2/src/authentic2_plugin_template/static/authentic2_plugin_template/.keepme rename to authentic2/src/authentic2_auf/static/authentic2_auf/.keepme diff --git a/authentic2/src/authentic2_plugin_template/templates/authentic2_plugin_template/index.html b/authentic2/src/authentic2_auf/templates/authentic2_auf/index.html similarity index 100% rename from authentic2/src/authentic2_plugin_template/templates/authentic2_plugin_template/index.html rename to authentic2/src/authentic2_auf/templates/authentic2_auf/index.html diff --git a/authentic2/src/authentic2_plugin_template/urls.py b/authentic2/src/authentic2_auf/urls.py similarity index 70% rename from authentic2/src/authentic2_plugin_template/urls.py rename to authentic2/src/authentic2_auf/urls.py index 578c4c0..9f9e971 100644 --- a/authentic2/src/authentic2_plugin_template/urls.py +++ b/authentic2/src/authentic2_auf/urls.py @@ -8,7 +8,7 @@ from .views import index urlpatterns = required( setting_enabled('ENABLE', settings=app_settings), patterns('', - url('^authentic2_plugin_template/$', index, - name='authentic2-plugin-template-index'), + url('^authentic2_auf/$', index, + name='authentic2-auf-index'), ) ) diff --git a/authentic2/src/authentic2_plugin_template/views.py b/authentic2/src/authentic2_auf/views.py similarity index 65% rename from authentic2/src/authentic2_plugin_template/views.py rename to authentic2/src/authentic2_auf/views.py index ad5596b..6ced003 100644 --- a/authentic2/src/authentic2_plugin_template/views.py +++ b/authentic2/src/authentic2_auf/views.py @@ -7,4 +7,4 @@ __ALL_ = [ 'sso' ] @decorators.plugin_enabled def index(request): - return render(request, 'authentic2_plugin_template/index.html') + return render(request, 'authentic2_auf/index.html')