diff --git a/README.md b/README.md index 683030c..82b93be 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ A user management module collection for the yii framework >= 1.1.14 Features: --------- -* Demo Project -* Installer +* Demo Project (https://github.com/thyseus/yii-user-management-demo) +* Installer (will probably be replaced with migrations) * User Administration * Role Administration * Hybrid auth is bundled and can easily be integrated, see user/docs/hybridauth.txt. @@ -33,15 +33,9 @@ Vimeo, Goodreads, Live, Pixnet, Steam, Vkontakte Usage with demo application: ------------------------------- -Starting from 0.9, a demo application is provided in the repository. +Starting from 0.9, a demo application is available here: -* Clone the package: -``` -$ git clone https://github.com/thyseus/yii-user-management -``` -* Set the path to your yii framework folder in index.php, -* create an empty folder assets/ and runtime/ with write access -* Navigate to http://localhost/yii-user-management/index.php +https://github.com/thyseus/yii-user-management-demo Installation using composer: -------------------- diff --git a/modules/avatar/AvatarModule.php b/avatar/AvatarModule.php similarity index 100% rename from modules/avatar/AvatarModule.php rename to avatar/AvatarModule.php diff --git a/modules/avatar/controllers/YumAvatarController.php b/avatar/controllers/YumAvatarController.php similarity index 100% rename from modules/avatar/controllers/YumAvatarController.php rename to avatar/controllers/YumAvatarController.php diff --git a/modules/avatar/views/avatar/_view.php b/avatar/views/avatar/_view.php similarity index 100% rename from modules/avatar/views/avatar/_view.php rename to avatar/views/avatar/_view.php diff --git a/modules/avatar/views/avatar/admin.php b/avatar/views/avatar/admin.php similarity index 100% rename from modules/avatar/views/avatar/admin.php rename to avatar/views/avatar/admin.php diff --git a/modules/avatar/views/avatar/edit_avatar.php b/avatar/views/avatar/edit_avatar.php similarity index 100% rename from modules/avatar/views/avatar/edit_avatar.php rename to avatar/views/avatar/edit_avatar.php diff --git a/composer.json b/composer.json index aae2f20..dda1be9 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "thyseus/yii-user-management", "description": "A user management module collection for the yii framework", "type": "library", - "keywords": ["user","role", "profile"], + "keywords": ["user","role", "profile", "friendship"], "homepage": "http://github.com/thyseus/yii-user-management", "license": "GPL", "authors": [ @@ -17,4 +17,4 @@ "php": ">=5.3.0", "yiisoft/yii": ">=1.1.14" } -} \ No newline at end of file +} diff --git a/controllers/SiteController.php b/controllers/SiteController.php deleted file mode 100644 index 022ed31..0000000 --- a/controllers/SiteController.php +++ /dev/null @@ -1,19 +0,0 @@ -render('index'); - } - - public function actionError() { - if($error=Yii::app()->errorHandler->error) { - if(Yii::app()->request->isAjaxRequest) - echo $error['message']; - else - $this->render('error', $error); - } - } -} diff --git a/modules/friendship/FriendshipModule.php b/friendship/FriendshipModule.php similarity index 100% rename from modules/friendship/FriendshipModule.php rename to friendship/FriendshipModule.php diff --git a/modules/friendship/controllers/YumFriendshipController.php b/friendship/controllers/YumFriendshipController.php similarity index 100% rename from modules/friendship/controllers/YumFriendshipController.php rename to friendship/controllers/YumFriendshipController.php diff --git a/modules/friendship/models/YumFriendship.php b/friendship/models/YumFriendship.php similarity index 100% rename from modules/friendship/models/YumFriendship.php rename to friendship/models/YumFriendship.php diff --git a/modules/friendship/views/friendship/_form.php b/friendship/views/friendship/_form.php similarity index 100% rename from modules/friendship/views/friendship/_form.php rename to friendship/views/friendship/_form.php diff --git a/modules/friendship/views/friendship/_view.php b/friendship/views/friendship/_view.php similarity index 100% rename from modules/friendship/views/friendship/_view.php rename to friendship/views/friendship/_view.php diff --git a/modules/friendship/views/friendship/admin.php b/friendship/views/friendship/admin.php similarity index 100% rename from modules/friendship/views/friendship/admin.php rename to friendship/views/friendship/admin.php diff --git a/modules/friendship/views/friendship/friendedit.php b/friendship/views/friendship/friendedit.php similarity index 100% rename from modules/friendship/views/friendship/friendedit.php rename to friendship/views/friendship/friendedit.php diff --git a/modules/friendship/views/friendship/friends.php b/friendship/views/friendship/friends.php similarity index 100% rename from modules/friendship/views/friendship/friends.php rename to friendship/views/friendship/friends.php diff --git a/modules/friendship/views/friendship/invitation.php b/friendship/views/friendship/invitation.php similarity index 100% rename from modules/friendship/views/friendship/invitation.php rename to friendship/views/friendship/invitation.php diff --git a/modules/friendship/views/friendship/myfriends.php b/friendship/views/friendship/myfriends.php similarity index 100% rename from modules/friendship/views/friendship/myfriends.php rename to friendship/views/friendship/myfriends.php diff --git a/modules/friendship/views/friendship/new_friends.php b/friendship/views/friendship/new_friends.php similarity index 100% rename from modules/friendship/views/friendship/new_friends.php rename to friendship/views/friendship/new_friends.php diff --git a/modules/friendship/views/friendship/update.php b/friendship/views/friendship/update.php similarity index 100% rename from modules/friendship/views/friendship/update.php rename to friendship/views/friendship/update.php diff --git a/modules/friendship/views/friendship/view.php b/friendship/views/friendship/view.php similarity index 100% rename from modules/friendship/views/friendship/view.php rename to friendship/views/friendship/view.php diff --git a/hybridauth.php b/hybridauth.php deleted file mode 100644 index dc4a7f1..0000000 --- a/hybridauth.php +++ /dev/null @@ -1,15 +0,0 @@ -dirname(__FILE__), - 'name'=>'Yii User Management Demo Application', - 'import'=>array( - 'application.models.*', - 'application.components.*', - 'application.modules.user.components.*', - 'application.modules.user.models.*', - ), - 'modules'=>array( - 'user' => array( - 'debug' => true, - 'loginType' => 7, // username, email and hybridauth - 'hybridAuthProviders' => array('Facebook', 'Twitter'), - ), - 'role' => array(), - 'registration' => array(), - 'profile' => array(), - 'avatar' => array(), - 'usergroup' => array(), - 'friendship' => array(), - 'message' => array(), - ), - 'components'=>array( - 'cache' => array('class' => 'system.caching.CFileCache'), - 'user'=>array( - 'class' => 'user.components.YumWebUser', - 'allowAutoLogin'=>true, - ), - 'urlManager'=>array( - 'urlFormat'=>'path', - 'rules'=>array( - '/'=>'/view', - '//'=>'/', - '/'=>'/', - ), - ), - 'db'=>array( - 'connectionString' => 'mysql:host=localhost;dbname=yii_user_management_demo', - 'emulatePrepare' => true, - 'tablePrefix' => '', - 'username' => 'root', - 'password' => '', - 'charset' => 'utf8', - ), - 'errorHandler'=>array( - 'errorAction'=>'site/error', - ), - ) - ) - -)->run(); diff --git a/modules/membership/MembershipModule.php b/membership/MembershipModule.php similarity index 100% rename from modules/membership/MembershipModule.php rename to membership/MembershipModule.php diff --git a/modules/membership/controllers/YumMembershipController.php b/membership/controllers/YumMembershipController.php similarity index 100% rename from modules/membership/controllers/YumMembershipController.php rename to membership/controllers/YumMembershipController.php diff --git a/modules/membership/controllers/YumPaymentController.php b/membership/controllers/YumPaymentController.php similarity index 100% rename from modules/membership/controllers/YumPaymentController.php rename to membership/controllers/YumPaymentController.php diff --git a/modules/membership/models/YumMembership.php b/membership/models/YumMembership.php similarity index 100% rename from modules/membership/models/YumMembership.php rename to membership/models/YumMembership.php diff --git a/modules/membership/models/YumPayment.php b/membership/models/YumPayment.php similarity index 100% rename from modules/membership/models/YumPayment.php rename to membership/models/YumPayment.php diff --git a/modules/membership/views/membership/_form.php b/membership/views/membership/_form.php similarity index 100% rename from modules/membership/views/membership/_form.php rename to membership/views/membership/_form.php diff --git a/modules/membership/views/membership/_miniform.php b/membership/views/membership/_miniform.php similarity index 100% rename from modules/membership/views/membership/_miniform.php rename to membership/views/membership/_miniform.php diff --git a/modules/membership/views/membership/_view.php b/membership/views/membership/_view.php similarity index 100% rename from modules/membership/views/membership/_view.php rename to membership/views/membership/_view.php diff --git a/modules/membership/views/membership/admin.php b/membership/views/membership/admin.php similarity index 100% rename from modules/membership/views/membership/admin.php rename to membership/views/membership/admin.php diff --git a/modules/membership/views/membership/buttons.php b/membership/views/membership/buttons.php similarity index 100% rename from modules/membership/views/membership/buttons.php rename to membership/views/membership/buttons.php diff --git a/modules/membership/views/membership/index.php b/membership/views/membership/index.php similarity index 100% rename from modules/membership/views/membership/index.php rename to membership/views/membership/index.php diff --git a/modules/membership/views/membership/membership_expired.php b/membership/views/membership/membership_expired.php similarity index 100% rename from modules/membership/views/membership/membership_expired.php rename to membership/views/membership/membership_expired.php diff --git a/modules/membership/views/membership/order.php b/membership/views/membership/order.php similarity index 100% rename from modules/membership/views/membership/order.php rename to membership/views/membership/order.php diff --git a/modules/membership/views/membership/orders.php b/membership/views/membership/orders.php similarity index 100% rename from modules/membership/views/membership/orders.php rename to membership/views/membership/orders.php diff --git a/modules/membership/views/membership/success.php b/membership/views/membership/success.php similarity index 100% rename from modules/membership/views/membership/success.php rename to membership/views/membership/success.php diff --git a/modules/membership/views/membership/update.php b/membership/views/membership/update.php similarity index 100% rename from modules/membership/views/membership/update.php rename to membership/views/membership/update.php diff --git a/modules/membership/views/membership/view.php b/membership/views/membership/view.php similarity index 100% rename from modules/membership/views/membership/view.php rename to membership/views/membership/view.php diff --git a/modules/membership/views/payment/_form.php b/membership/views/payment/_form.php similarity index 100% rename from modules/membership/views/payment/_form.php rename to membership/views/payment/_form.php diff --git a/modules/membership/views/payment/_miniform.php b/membership/views/payment/_miniform.php similarity index 100% rename from modules/membership/views/payment/_miniform.php rename to membership/views/payment/_miniform.php diff --git a/modules/membership/views/payment/_view.php b/membership/views/payment/_view.php similarity index 100% rename from modules/membership/views/payment/_view.php rename to membership/views/payment/_view.php diff --git a/modules/membership/views/payment/admin.php b/membership/views/payment/admin.php similarity index 100% rename from modules/membership/views/payment/admin.php rename to membership/views/payment/admin.php diff --git a/modules/membership/views/payment/buttons.php b/membership/views/payment/buttons.php similarity index 100% rename from modules/membership/views/payment/buttons.php rename to membership/views/payment/buttons.php diff --git a/modules/membership/views/payment/create.php b/membership/views/payment/create.php similarity index 100% rename from modules/membership/views/payment/create.php rename to membership/views/payment/create.php diff --git a/modules/membership/views/payment/index.php b/membership/views/payment/index.php similarity index 100% rename from modules/membership/views/payment/index.php rename to membership/views/payment/index.php diff --git a/modules/membership/views/payment/success.php b/membership/views/payment/success.php similarity index 100% rename from modules/membership/views/payment/success.php rename to membership/views/payment/success.php diff --git a/modules/membership/views/payment/update.php b/membership/views/payment/update.php similarity index 100% rename from modules/membership/views/payment/update.php rename to membership/views/payment/update.php diff --git a/modules/membership/views/payment/view.php b/membership/views/payment/view.php similarity index 100% rename from modules/membership/views/payment/view.php rename to membership/views/payment/view.php diff --git a/modules/message/MessageModule.php b/message/MessageModule.php similarity index 100% rename from modules/message/MessageModule.php rename to message/MessageModule.php diff --git a/modules/message/components/MessageWidget.php b/message/components/MessageWidget.php similarity index 100% rename from modules/message/components/MessageWidget.php rename to message/components/MessageWidget.php diff --git a/modules/message/components/views/messages.php b/message/components/views/messages.php similarity index 100% rename from modules/message/components/views/messages.php rename to message/components/views/messages.php diff --git a/modules/message/controllers/YumMessageController.php b/message/controllers/YumMessageController.php similarity index 100% rename from modules/message/controllers/YumMessageController.php rename to message/controllers/YumMessageController.php diff --git a/modules/message/models/YumMessage.php b/message/models/YumMessage.php similarity index 100% rename from modules/message/models/YumMessage.php rename to message/models/YumMessage.php diff --git a/modules/message/views/message/compose.php b/message/views/message/compose.php similarity index 100% rename from modules/message/views/message/compose.php rename to message/views/message/compose.php diff --git a/modules/message/views/message/index.php b/message/views/message/index.php similarity index 100% rename from modules/message/views/message/index.php rename to message/views/message/index.php diff --git a/modules/message/views/message/message.php b/message/views/message/message.php similarity index 100% rename from modules/message/views/message/message.php rename to message/views/message/message.php diff --git a/modules/message/views/message/message_view_forbidden.php b/message/views/message/message_view_forbidden.php similarity index 100% rename from modules/message/views/message/message_view_forbidden.php rename to message/views/message/message_view_forbidden.php diff --git a/modules/message/views/message/messages.php b/message/views/message/messages.php similarity index 100% rename from modules/message/views/message/messages.php rename to message/views/message/messages.php diff --git a/modules/message/views/message/new_messages.php b/message/views/message/new_messages.php similarity index 100% rename from modules/message/views/message/new_messages.php rename to message/views/message/new_messages.php diff --git a/modules/message/views/message/new_messages_dialog.php b/message/views/message/new_messages_dialog.php similarity index 100% rename from modules/message/views/message/new_messages_dialog.php rename to message/views/message/new_messages_dialog.php diff --git a/modules/message/views/message/new_messages_plain.php b/message/views/message/new_messages_plain.php similarity index 100% rename from modules/message/views/message/new_messages_plain.php rename to message/views/message/new_messages_plain.php diff --git a/modules/message/views/message/reply.php b/message/views/message/reply.php similarity index 100% rename from modules/message/views/message/reply.php rename to message/views/message/reply.php diff --git a/modules/message/views/message/sent.php b/message/views/message/sent.php similarity index 100% rename from modules/message/views/message/sent.php rename to message/views/message/sent.php diff --git a/modules/message/views/message/success.php b/message/views/message/success.php similarity index 100% rename from modules/message/views/message/success.php rename to message/views/message/success.php diff --git a/modules/message/views/message/view.php b/message/views/message/view.php similarity index 100% rename from modules/message/views/message/view.php rename to message/views/message/view.php diff --git a/modules/message/views/message/write_a_message.php b/message/views/message/write_a_message.php similarity index 100% rename from modules/message/views/message/write_a_message.php rename to message/views/message/write_a_message.php diff --git a/modules/user/views/user/confirmDeletion.php~ b/modules/user/views/user/confirmDeletion.php~ deleted file mode 100644 index e69de29..0000000 diff --git a/modules/profile/ProfileModule.php b/profile/ProfileModule.php similarity index 100% rename from modules/profile/ProfileModule.php rename to profile/ProfileModule.php diff --git a/modules/profile/components/ProfileCommentsWidget.php b/profile/components/ProfileCommentsWidget.php similarity index 100% rename from modules/profile/components/ProfileCommentsWidget.php rename to profile/components/ProfileCommentsWidget.php diff --git a/modules/profile/components/ProfileVisitWidget.php b/profile/components/ProfileVisitWidget.php similarity index 100% rename from modules/profile/components/ProfileVisitWidget.php rename to profile/components/ProfileVisitWidget.php diff --git a/modules/profile/components/views/profile_comments.php b/profile/components/views/profile_comments.php similarity index 100% rename from modules/profile/components/views/profile_comments.php rename to profile/components/views/profile_comments.php diff --git a/modules/profile/components/views/profile_visits.php b/profile/components/views/profile_visits.php similarity index 100% rename from modules/profile/components/views/profile_visits.php rename to profile/components/views/profile_visits.php diff --git a/modules/profile/controllers/YumPrivacysettingController.php b/profile/controllers/YumPrivacysettingController.php similarity index 100% rename from modules/profile/controllers/YumPrivacysettingController.php rename to profile/controllers/YumPrivacysettingController.php diff --git a/modules/profile/controllers/YumProfileCommentController.php b/profile/controllers/YumProfileCommentController.php similarity index 100% rename from modules/profile/controllers/YumProfileCommentController.php rename to profile/controllers/YumProfileCommentController.php diff --git a/modules/profile/controllers/YumProfileController.php b/profile/controllers/YumProfileController.php similarity index 100% rename from modules/profile/controllers/YumProfileController.php rename to profile/controllers/YumProfileController.php diff --git a/modules/profile/models/YumPrivacySetting.php b/profile/models/YumPrivacySetting.php similarity index 100% rename from modules/profile/models/YumPrivacySetting.php rename to profile/models/YumPrivacySetting.php diff --git a/modules/profile/models/YumProfile.php b/profile/models/YumProfile.php similarity index 100% rename from modules/profile/models/YumProfile.php rename to profile/models/YumProfile.php diff --git a/modules/profile/models/YumProfileComment.php b/profile/models/YumProfileComment.php similarity index 100% rename from modules/profile/models/YumProfileComment.php rename to profile/models/YumProfileComment.php diff --git a/modules/profile/models/YumProfileVisit.php b/profile/models/YumProfileVisit.php similarity index 100% rename from modules/profile/models/YumProfileVisit.php rename to profile/models/YumProfileVisit.php diff --git a/modules/profile/views/layouts/yumprofile.php b/profile/views/layouts/yumprofile.php similarity index 100% rename from modules/profile/views/layouts/yumprofile.php rename to profile/views/layouts/yumprofile.php diff --git a/modules/profile/views/privacy/update.php b/profile/views/privacy/update.php similarity index 100% rename from modules/profile/views/privacy/update.php rename to profile/views/privacy/update.php diff --git a/modules/profile/views/profile/_form.php b/profile/views/profile/_form.php similarity index 100% rename from modules/profile/views/profile/_form.php rename to profile/views/profile/_form.php diff --git a/modules/profile/views/profile/_search.php b/profile/views/profile/_search.php similarity index 100% rename from modules/profile/views/profile/_search.php rename to profile/views/profile/_search.php diff --git a/modules/profile/views/profile/admin.php b/profile/views/profile/admin.php similarity index 100% rename from modules/profile/views/profile/admin.php rename to profile/views/profile/admin.php diff --git a/modules/profile/views/profile/myprofile.php b/profile/views/profile/myprofile.php similarity index 100% rename from modules/profile/views/profile/myprofile.php rename to profile/views/profile/myprofile.php diff --git a/modules/profile/views/profile/profilenotallowed.php b/profile/views/profile/profilenotallowed.php similarity index 100% rename from modules/profile/views/profile/profilenotallowed.php rename to profile/views/profile/profilenotallowed.php diff --git a/modules/profile/views/profile/public_fields.php b/profile/views/profile/public_fields.php similarity index 100% rename from modules/profile/views/profile/public_fields.php rename to profile/views/profile/public_fields.php diff --git a/modules/profile/views/profile/update.php b/profile/views/profile/update.php similarity index 100% rename from modules/profile/views/profile/update.php rename to profile/views/profile/update.php diff --git a/modules/profile/views/profile/view.php b/profile/views/profile/view.php similarity index 100% rename from modules/profile/views/profile/view.php rename to profile/views/profile/view.php diff --git a/modules/profile/views/profile/visits.php b/profile/views/profile/visits.php similarity index 100% rename from modules/profile/views/profile/visits.php rename to profile/views/profile/visits.php diff --git a/modules/profile/views/profileComment/_miniform.php b/profile/views/profileComment/_miniform.php similarity index 100% rename from modules/profile/views/profileComment/_miniform.php rename to profile/views/profileComment/_miniform.php diff --git a/modules/profile/views/profileComment/_search.php b/profile/views/profileComment/_search.php similarity index 100% rename from modules/profile/views/profileComment/_search.php rename to profile/views/profileComment/_search.php diff --git a/modules/profile/views/profileComment/_view.php b/profile/views/profileComment/_view.php similarity index 100% rename from modules/profile/views/profileComment/_view.php rename to profile/views/profileComment/_view.php diff --git a/modules/profile/views/profileComment/admin.php b/profile/views/profileComment/admin.php similarity index 100% rename from modules/profile/views/profileComment/admin.php rename to profile/views/profileComment/admin.php diff --git a/modules/profile/views/profileComment/buttons.php b/profile/views/profileComment/buttons.php similarity index 100% rename from modules/profile/views/profileComment/buttons.php rename to profile/views/profileComment/buttons.php diff --git a/modules/profile/views/profileComment/create.php b/profile/views/profileComment/create.php similarity index 100% rename from modules/profile/views/profileComment/create.php rename to profile/views/profileComment/create.php diff --git a/modules/profile/views/profileComment/index.php b/profile/views/profileComment/index.php similarity index 100% rename from modules/profile/views/profileComment/index.php rename to profile/views/profileComment/index.php diff --git a/modules/profile/views/profileComment/success.php b/profile/views/profileComment/success.php similarity index 100% rename from modules/profile/views/profileComment/success.php rename to profile/views/profileComment/success.php diff --git a/modules/profile/views/profileComment/update.php b/profile/views/profileComment/update.php similarity index 100% rename from modules/profile/views/profileComment/update.php rename to profile/views/profileComment/update.php diff --git a/modules/registration/RegistrationModule.php b/registration/RegistrationModule.php similarity index 100% rename from modules/registration/RegistrationModule.php rename to registration/RegistrationModule.php diff --git a/modules/registration/controllers/YumRegistrationController.php b/registration/controllers/YumRegistrationController.php similarity index 100% rename from modules/registration/controllers/YumRegistrationController.php rename to registration/controllers/YumRegistrationController.php diff --git a/modules/registration/models/YumPasswordRecoveryForm.php b/registration/models/YumPasswordRecoveryForm.php similarity index 100% rename from modules/registration/models/YumPasswordRecoveryForm.php rename to registration/models/YumPasswordRecoveryForm.php diff --git a/modules/registration/models/YumRegistration.php b/registration/models/YumRegistration.php similarity index 100% rename from modules/registration/models/YumRegistration.php rename to registration/models/YumRegistration.php diff --git a/modules/registration/models/YumRegistrationForm.php b/registration/models/YumRegistrationForm.php similarity index 100% rename from modules/registration/models/YumRegistrationForm.php rename to registration/models/YumRegistrationForm.php diff --git a/modules/registration/views/registration/activation_failure.php b/registration/views/registration/activation_failure.php similarity index 100% rename from modules/registration/views/registration/activation_failure.php rename to registration/views/registration/activation_failure.php diff --git a/modules/registration/views/registration/activation_success.php b/registration/views/registration/activation_success.php similarity index 100% rename from modules/registration/views/registration/activation_success.php rename to registration/views/registration/activation_success.php diff --git a/modules/registration/views/registration/recovery.php b/registration/views/registration/recovery.php similarity index 100% rename from modules/registration/views/registration/recovery.php rename to registration/views/registration/recovery.php diff --git a/modules/registration/views/registration/registration.php b/registration/views/registration/registration.php similarity index 100% rename from modules/registration/views/registration/registration.php rename to registration/views/registration/registration.php diff --git a/modules/role/RoleModule.php b/role/RoleModule.php similarity index 100% rename from modules/role/RoleModule.php rename to role/RoleModule.php diff --git a/modules/role/controllers/YumActionController.php b/role/controllers/YumActionController.php similarity index 100% rename from modules/role/controllers/YumActionController.php rename to role/controllers/YumActionController.php diff --git a/modules/role/controllers/YumPermissionController.php b/role/controllers/YumPermissionController.php similarity index 100% rename from modules/role/controllers/YumPermissionController.php rename to role/controllers/YumPermissionController.php diff --git a/modules/role/controllers/YumRoleController.php b/role/controllers/YumRoleController.php similarity index 100% rename from modules/role/controllers/YumRoleController.php rename to role/controllers/YumRoleController.php diff --git a/modules/role/models/YumAction.php b/role/models/YumAction.php similarity index 100% rename from modules/role/models/YumAction.php rename to role/models/YumAction.php diff --git a/modules/role/models/YumPermission.php b/role/models/YumPermission.php similarity index 100% rename from modules/role/models/YumPermission.php rename to role/models/YumPermission.php diff --git a/modules/role/models/YumRole.php b/role/models/YumRole.php similarity index 100% rename from modules/role/models/YumRole.php rename to role/models/YumRole.php diff --git a/modules/role/views/action/_form.php b/role/views/action/_form.php similarity index 100% rename from modules/role/views/action/_form.php rename to role/views/action/_form.php diff --git a/modules/role/views/action/_view.php b/role/views/action/_view.php similarity index 100% rename from modules/role/views/action/_view.php rename to role/views/action/_view.php diff --git a/modules/role/views/action/admin.php b/role/views/action/admin.php similarity index 100% rename from modules/role/views/action/admin.php rename to role/views/action/admin.php diff --git a/modules/role/views/action/create.php b/role/views/action/create.php similarity index 100% rename from modules/role/views/action/create.php rename to role/views/action/create.php diff --git a/modules/role/views/action/index.php b/role/views/action/index.php similarity index 100% rename from modules/role/views/action/index.php rename to role/views/action/index.php diff --git a/modules/role/views/action/update.php b/role/views/action/update.php similarity index 100% rename from modules/role/views/action/update.php rename to role/views/action/update.php diff --git a/modules/role/views/action/view.php b/role/views/action/view.php similarity index 100% rename from modules/role/views/action/view.php rename to role/views/action/view.php diff --git a/modules/role/views/permission/admin.php b/role/views/permission/admin.php similarity index 100% rename from modules/role/views/permission/admin.php rename to role/views/permission/admin.php diff --git a/modules/role/views/permission/create.php b/role/views/permission/create.php similarity index 100% rename from modules/role/views/permission/create.php rename to role/views/permission/create.php diff --git a/modules/role/views/permission/view.php b/role/views/permission/view.php similarity index 100% rename from modules/role/views/permission/view.php rename to role/views/permission/view.php diff --git a/modules/role/views/role/_form.php b/role/views/role/_form.php similarity index 100% rename from modules/role/views/role/_form.php rename to role/views/role/_form.php diff --git a/modules/role/views/role/admin.php b/role/views/role/admin.php similarity index 100% rename from modules/role/views/role/admin.php rename to role/views/role/admin.php diff --git a/modules/role/views/role/create.php b/role/views/role/create.php similarity index 100% rename from modules/role/views/role/create.php rename to role/views/role/create.php diff --git a/modules/role/views/role/update.php b/role/views/role/update.php similarity index 100% rename from modules/role/views/role/update.php rename to role/views/role/update.php diff --git a/modules/role/views/role/view.php b/role/views/role/view.php similarity index 100% rename from modules/role/views/role/view.php rename to role/views/role/view.php diff --git a/modules/user/UserModule.php b/user/UserModule.php similarity index 100% rename from modules/user/UserModule.php rename to user/UserModule.php diff --git a/modules/user/assets/css/bootstrap.min.css b/user/assets/css/bootstrap.min.css similarity index 100% rename from modules/user/assets/css/bootstrap.min.css rename to user/assets/css/bootstrap.min.css diff --git a/modules/user/assets/css/statistics.css b/user/assets/css/statistics.css similarity index 100% rename from modules/user/assets/css/statistics.css rename to user/assets/css/statistics.css diff --git a/modules/user/assets/css/yum.css b/user/assets/css/yum.css similarity index 100% rename from modules/user/assets/css/yum.css rename to user/assets/css/yum.css diff --git a/modules/user/assets/images/facebook.png b/user/assets/images/facebook.png similarity index 100% rename from modules/user/assets/images/facebook.png rename to user/assets/images/facebook.png diff --git a/modules/user/assets/images/google.png b/user/assets/images/google.png similarity index 100% rename from modules/user/assets/images/google.png rename to user/assets/images/google.png diff --git a/modules/user/assets/images/green_button.png b/user/assets/images/green_button.png similarity index 100% rename from modules/user/assets/images/green_button.png rename to user/assets/images/green_button.png diff --git a/modules/user/assets/images/linkedin.png b/user/assets/images/linkedin.png similarity index 100% rename from modules/user/assets/images/linkedin.png rename to user/assets/images/linkedin.png diff --git a/modules/user/assets/images/live.png b/user/assets/images/live.png similarity index 100% rename from modules/user/assets/images/live.png rename to user/assets/images/live.png diff --git a/modules/user/assets/images/livejournal.png b/user/assets/images/livejournal.png similarity index 100% rename from modules/user/assets/images/livejournal.png rename to user/assets/images/livejournal.png diff --git a/modules/user/assets/images/myspace.png b/user/assets/images/myspace.png similarity index 100% rename from modules/user/assets/images/myspace.png rename to user/assets/images/myspace.png diff --git a/modules/user/assets/images/no_avatar_available.jpg b/user/assets/images/no_avatar_available.jpg similarity index 100% rename from modules/user/assets/images/no_avatar_available.jpg rename to user/assets/images/no_avatar_available.jpg diff --git a/modules/user/assets/images/no_avatar_available_thumb.jpg b/user/assets/images/no_avatar_available_thumb.jpg similarity index 100% rename from modules/user/assets/images/no_avatar_available_thumb.jpg rename to user/assets/images/no_avatar_available_thumb.jpg diff --git a/modules/user/assets/images/openid.png b/user/assets/images/openid.png similarity index 100% rename from modules/user/assets/images/openid.png rename to user/assets/images/openid.png diff --git a/modules/user/assets/images/tumblr.png b/user/assets/images/tumblr.png similarity index 100% rename from modules/user/assets/images/tumblr.png rename to user/assets/images/tumblr.png diff --git a/modules/user/assets/images/twitter.png b/user/assets/images/twitter.png similarity index 100% rename from modules/user/assets/images/twitter.png rename to user/assets/images/twitter.png diff --git a/modules/user/assets/images/wordpress.png b/user/assets/images/wordpress.png similarity index 100% rename from modules/user/assets/images/wordpress.png rename to user/assets/images/wordpress.png diff --git a/modules/user/assets/images/yahoo.png b/user/assets/images/yahoo.png similarity index 100% rename from modules/user/assets/images/yahoo.png rename to user/assets/images/yahoo.png diff --git a/modules/user/assets/js/bootstrap.min.js b/user/assets/js/bootstrap.min.js similarity index 100% rename from modules/user/assets/js/bootstrap.min.js rename to user/assets/js/bootstrap.min.js diff --git a/modules/user/assets/js/pStrength.jquery.js b/user/assets/js/pStrength.jquery.js similarity index 100% rename from modules/user/assets/js/pStrength.jquery.js rename to user/assets/js/pStrength.jquery.js diff --git a/modules/user/assets/js/tooltip.min.js b/user/assets/js/tooltip.min.js similarity index 100% rename from modules/user/assets/js/tooltip.min.js rename to user/assets/js/tooltip.min.js diff --git a/modules/user/assets/js/tooltip_users.js b/user/assets/js/tooltip_users.js similarity index 100% rename from modules/user/assets/js/tooltip_users.js rename to user/assets/js/tooltip_users.js diff --git a/modules/user/commands/ImportCommand.php b/user/commands/ImportCommand.php similarity index 100% rename from modules/user/commands/ImportCommand.php rename to user/commands/ImportCommand.php diff --git a/modules/user/components/CAdvYum.php b/user/components/CAdvYum.php similarity index 100% rename from modules/user/components/CAdvYum.php rename to user/components/CAdvYum.php diff --git a/modules/user/components/CAdvancedArBehavior.php b/user/components/CAdvancedArBehavior.php similarity index 100% rename from modules/user/components/CAdvancedArBehavior.php rename to user/components/CAdvancedArBehavior.php diff --git a/modules/user/components/CSVExport.php b/user/components/CSVExport.php similarity index 100% rename from modules/user/components/CSVExport.php rename to user/components/CSVExport.php diff --git a/modules/user/components/CSerializeBehavior.php b/user/components/CSerializeBehavior.php similarity index 100% rename from modules/user/components/CSerializeBehavior.php rename to user/components/CSerializeBehavior.php diff --git a/modules/user/components/CsvGridView.php b/user/components/CsvGridView.php similarity index 100% rename from modules/user/components/CsvGridView.php rename to user/components/CsvGridView.php diff --git a/modules/user/components/EPasswordGenerator.php b/user/components/EPasswordGenerator.php similarity index 100% rename from modules/user/components/EPasswordGenerator.php rename to user/components/EPasswordGenerator.php diff --git a/modules/user/components/EPhotoValidator.php b/user/components/EPhotoValidator.php similarity index 100% rename from modules/user/components/EPhotoValidator.php rename to user/components/EPhotoValidator.php diff --git a/modules/user/components/LoginWidget.php b/user/components/LoginWidget.php similarity index 100% rename from modules/user/components/LoginWidget.php rename to user/components/LoginWidget.php diff --git a/modules/user/components/Relation.php b/user/components/Relation.php similarity index 100% rename from modules/user/components/Relation.php rename to user/components/Relation.php diff --git a/modules/user/components/YumAdminMenu.php b/user/components/YumAdminMenu.php similarity index 100% rename from modules/user/components/YumAdminMenu.php rename to user/components/YumAdminMenu.php diff --git a/modules/user/components/YumMailer.php b/user/components/YumMailer.php similarity index 100% rename from modules/user/components/YumMailer.php rename to user/components/YumMailer.php diff --git a/modules/user/components/YumMenu.php b/user/components/YumMenu.php similarity index 100% rename from modules/user/components/YumMenu.php rename to user/components/YumMenu.php diff --git a/modules/user/components/YumPasswordValidator.php b/user/components/YumPasswordValidator.php similarity index 100% rename from modules/user/components/YumPasswordValidator.php rename to user/components/YumPasswordValidator.php diff --git a/modules/user/components/YumUserIdentity.php b/user/components/YumUserIdentity.php similarity index 100% rename from modules/user/components/YumUserIdentity.php rename to user/components/YumUserIdentity.php diff --git a/modules/user/components/YumUserMenu.php b/user/components/YumUserMenu.php similarity index 100% rename from modules/user/components/YumUserMenu.php rename to user/components/YumUserMenu.php diff --git a/modules/user/components/YumWebUser.php b/user/components/YumWebUser.php similarity index 100% rename from modules/user/components/YumWebUser.php rename to user/components/YumWebUser.php diff --git a/modules/user/components/select2/.gitignore b/user/components/select2/.gitignore similarity index 100% rename from modules/user/components/select2/.gitignore rename to user/components/select2/.gitignore diff --git a/modules/user/components/select2/ESelect2.php b/user/components/select2/ESelect2.php similarity index 100% rename from modules/user/components/select2/ESelect2.php rename to user/components/select2/ESelect2.php diff --git a/modules/user/components/select2/README.md b/user/components/select2/README.md similarity index 100% rename from modules/user/components/select2/README.md rename to user/components/select2/README.md diff --git a/modules/user/components/select2/assets/LICENSE b/user/components/select2/assets/LICENSE similarity index 100% rename from modules/user/components/select2/assets/LICENSE rename to user/components/select2/assets/LICENSE diff --git a/modules/user/components/select2/assets/README.md b/user/components/select2/assets/README.md similarity index 100% rename from modules/user/components/select2/assets/README.md rename to user/components/select2/assets/README.md diff --git a/modules/user/components/select2/assets/component.json b/user/components/select2/assets/component.json similarity index 100% rename from modules/user/components/select2/assets/component.json rename to user/components/select2/assets/component.json diff --git a/modules/user/components/select2/assets/release.sh b/user/components/select2/assets/release.sh similarity index 100% rename from modules/user/components/select2/assets/release.sh rename to user/components/select2/assets/release.sh diff --git a/modules/user/components/select2/assets/select2-spinner.gif b/user/components/select2/assets/select2-spinner.gif similarity index 100% rename from modules/user/components/select2/assets/select2-spinner.gif rename to user/components/select2/assets/select2-spinner.gif diff --git a/modules/user/components/select2/assets/select2.css b/user/components/select2/assets/select2.css similarity index 100% rename from modules/user/components/select2/assets/select2.css rename to user/components/select2/assets/select2.css diff --git a/modules/user/components/select2/assets/select2.jquery.json b/user/components/select2/assets/select2.jquery.json similarity index 100% rename from modules/user/components/select2/assets/select2.jquery.json rename to user/components/select2/assets/select2.jquery.json diff --git a/modules/user/components/select2/assets/select2.js b/user/components/select2/assets/select2.js similarity index 100% rename from modules/user/components/select2/assets/select2.js rename to user/components/select2/assets/select2.js diff --git a/modules/user/components/select2/assets/select2.min.js b/user/components/select2/assets/select2.min.js similarity index 100% rename from modules/user/components/select2/assets/select2.min.js rename to user/components/select2/assets/select2.min.js diff --git a/modules/user/components/select2/assets/select2.png b/user/components/select2/assets/select2.png similarity index 100% rename from modules/user/components/select2/assets/select2.png rename to user/components/select2/assets/select2.png diff --git a/modules/user/components/select2/assets/select2_locale_it.js b/user/components/select2/assets/select2_locale_it.js similarity index 100% rename from modules/user/components/select2/assets/select2_locale_it.js rename to user/components/select2/assets/select2_locale_it.js diff --git a/modules/user/components/select2/assets/select2x2.png b/user/components/select2/assets/select2x2.png similarity index 100% rename from modules/user/components/select2/assets/select2x2.png rename to user/components/select2/assets/select2x2.png diff --git a/modules/user/components/select2/assets/spinner.gif b/user/components/select2/assets/spinner.gif similarity index 100% rename from modules/user/components/select2/assets/spinner.gif rename to user/components/select2/assets/spinner.gif diff --git a/modules/user/components/select2/messages/id/select2.php b/user/components/select2/messages/id/select2.php similarity index 100% rename from modules/user/components/select2/messages/id/select2.php rename to user/components/select2/messages/id/select2.php diff --git a/modules/user/components/select2/messages/pl/select2.php b/user/components/select2/messages/pl/select2.php similarity index 100% rename from modules/user/components/select2/messages/pl/select2.php rename to user/components/select2/messages/pl/select2.php diff --git a/modules/user/components/views/quicklogin.php b/user/components/views/quicklogin.php similarity index 100% rename from modules/user/components/views/quicklogin.php rename to user/components/views/quicklogin.php diff --git a/modules/user/controllers/YumAuthController.php b/user/controllers/YumAuthController.php similarity index 100% rename from modules/user/controllers/YumAuthController.php rename to user/controllers/YumAuthController.php diff --git a/modules/user/controllers/YumController.php b/user/controllers/YumController.php similarity index 100% rename from modules/user/controllers/YumController.php rename to user/controllers/YumController.php diff --git a/modules/user/controllers/YumCsvController.php b/user/controllers/YumCsvController.php similarity index 100% rename from modules/user/controllers/YumCsvController.php rename to user/controllers/YumCsvController.php diff --git a/modules/user/controllers/YumDefaultController.php b/user/controllers/YumDefaultController.php similarity index 100% rename from modules/user/controllers/YumDefaultController.php rename to user/controllers/YumDefaultController.php diff --git a/modules/user/controllers/YumInstallController.php b/user/controllers/YumInstallController.php similarity index 100% rename from modules/user/controllers/YumInstallController.php rename to user/controllers/YumInstallController.php diff --git a/modules/user/controllers/YumRestController.php b/user/controllers/YumRestController.php similarity index 100% rename from modules/user/controllers/YumRestController.php rename to user/controllers/YumRestController.php diff --git a/modules/user/controllers/YumStatisticsController.php b/user/controllers/YumStatisticsController.php similarity index 100% rename from modules/user/controllers/YumStatisticsController.php rename to user/controllers/YumStatisticsController.php diff --git a/modules/user/controllers/YumTranslationController.php b/user/controllers/YumTranslationController.php similarity index 100% rename from modules/user/controllers/YumTranslationController.php rename to user/controllers/YumTranslationController.php diff --git a/modules/user/controllers/YumUserController.php b/user/controllers/YumUserController.php similarity index 100% rename from modules/user/controllers/YumUserController.php rename to user/controllers/YumUserController.php diff --git a/modules/user/docs/RESTful_api.txt b/user/docs/RESTful_api.txt similarity index 100% rename from modules/user/docs/RESTful_api.txt rename to user/docs/RESTful_api.txt diff --git a/modules/user/docs/avatar.txt b/user/docs/avatar.txt similarity index 100% rename from modules/user/docs/avatar.txt rename to user/docs/avatar.txt diff --git a/modules/user/docs/changelog.txt b/user/docs/changelog.txt similarity index 100% rename from modules/user/docs/changelog.txt rename to user/docs/changelog.txt diff --git a/modules/user/docs/hybridauth.txt b/user/docs/hybridauth.txt similarity index 100% rename from modules/user/docs/hybridauth.txt rename to user/docs/hybridauth.txt diff --git a/modules/user/docs/logging.txt b/user/docs/logging.txt similarity index 100% rename from modules/user/docs/logging.txt rename to user/docs/logging.txt diff --git a/modules/user/docs/membership.txt b/user/docs/membership.txt similarity index 100% rename from modules/user/docs/membership.txt rename to user/docs/membership.txt diff --git a/modules/user/docs/messages.txt b/user/docs/messages.txt similarity index 100% rename from modules/user/docs/messages.txt rename to user/docs/messages.txt diff --git a/modules/user/docs/messages_daily_digest.txt b/user/docs/messages_daily_digest.txt similarity index 100% rename from modules/user/docs/messages_daily_digest.txt rename to user/docs/messages_daily_digest.txt diff --git a/modules/user/docs/permission_system.txt b/user/docs/permission_system.txt similarity index 100% rename from modules/user/docs/permission_system.txt rename to user/docs/permission_system.txt diff --git a/modules/user/docs/registration.txt b/user/docs/registration.txt similarity index 100% rename from modules/user/docs/registration.txt rename to user/docs/registration.txt diff --git a/modules/user/docs/testing.txt b/user/docs/testing.txt similarity index 100% rename from modules/user/docs/testing.txt rename to user/docs/testing.txt diff --git a/modules/user/docs/upgrade.txt b/user/docs/upgrade.txt similarity index 100% rename from modules/user/docs/upgrade.txt rename to user/docs/upgrade.txt diff --git a/modules/user/docs/yum_translation.sql b/user/docs/yum_translation.sql similarity index 100% rename from modules/user/docs/yum_translation.sql rename to user/docs/yum_translation.sql diff --git a/modules/user/messages/de/yum_action.php b/user/messages/de/yum_action.php similarity index 100% rename from modules/user/messages/de/yum_action.php rename to user/messages/de/yum_action.php diff --git a/modules/user/messages/de/yum_registration.php b/user/messages/de/yum_registration.php similarity index 100% rename from modules/user/messages/de/yum_registration.php rename to user/messages/de/yum_registration.php diff --git a/modules/user/messages/de/yum_yumTextSettings.php b/user/messages/de/yum_yumTextSettings.php similarity index 100% rename from modules/user/messages/de/yum_yumTextSettings.php rename to user/messages/de/yum_yumTextSettings.php diff --git a/modules/user/models/Yum.php b/user/models/Yum.php similarity index 100% rename from modules/user/models/Yum.php rename to user/models/Yum.php diff --git a/modules/user/models/YumActiveRecord.php b/user/models/YumActiveRecord.php similarity index 100% rename from modules/user/models/YumActiveRecord.php rename to user/models/YumActiveRecord.php diff --git a/modules/user/models/YumEncrypt.php b/user/models/YumEncrypt.php similarity index 100% rename from modules/user/models/YumEncrypt.php rename to user/models/YumEncrypt.php diff --git a/modules/user/models/YumFormModel.php b/user/models/YumFormModel.php similarity index 100% rename from modules/user/models/YumFormModel.php rename to user/models/YumFormModel.php diff --git a/modules/user/models/YumTranslation.php b/user/models/YumTranslation.php similarity index 100% rename from modules/user/models/YumTranslation.php rename to user/models/YumTranslation.php diff --git a/modules/user/models/YumUser.php b/user/models/YumUser.php similarity index 100% rename from modules/user/models/YumUser.php rename to user/models/YumUser.php diff --git a/modules/user/models/YumUserChangePassword.php b/user/models/YumUserChangePassword.php similarity index 100% rename from modules/user/models/YumUserChangePassword.php rename to user/models/YumUserChangePassword.php diff --git a/modules/user/models/YumUserLogin.php b/user/models/YumUserLogin.php similarity index 100% rename from modules/user/models/YumUserLogin.php rename to user/models/YumUserLogin.php diff --git a/modules/user/tests/unit/RegistrationTest.php b/user/tests/unit/RegistrationTest.php similarity index 100% rename from modules/user/tests/unit/RegistrationTest.php rename to user/tests/unit/RegistrationTest.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Auth.php b/user/vendors/hybridauth/Hybrid/Auth.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Auth.php rename to user/vendors/hybridauth/Hybrid/Auth.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Endpoint.php b/user/vendors/hybridauth/Hybrid/Endpoint.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Endpoint.php rename to user/vendors/hybridauth/Hybrid/Endpoint.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Error.php b/user/vendors/hybridauth/Hybrid/Error.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Error.php rename to user/vendors/hybridauth/Hybrid/Error.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Logger.php b/user/vendors/hybridauth/Hybrid/Logger.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Logger.php rename to user/vendors/hybridauth/Hybrid/Logger.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Provider_Adapter.php b/user/vendors/hybridauth/Hybrid/Provider_Adapter.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Provider_Adapter.php rename to user/vendors/hybridauth/Hybrid/Provider_Adapter.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Provider_Model.php b/user/vendors/hybridauth/Hybrid/Provider_Model.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Provider_Model.php rename to user/vendors/hybridauth/Hybrid/Provider_Model.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth1.php b/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth1.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth1.php rename to user/vendors/hybridauth/Hybrid/Provider_Model_OAuth1.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth2.php b/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth2.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Provider_Model_OAuth2.php rename to user/vendors/hybridauth/Hybrid/Provider_Model_OAuth2.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Provider_Model_OpenID.php b/user/vendors/hybridauth/Hybrid/Provider_Model_OpenID.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Provider_Model_OpenID.php rename to user/vendors/hybridauth/Hybrid/Provider_Model_OpenID.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/AOL.php b/user/vendors/hybridauth/Hybrid/Providers/AOL.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/AOL.php rename to user/vendors/hybridauth/Hybrid/Providers/AOL.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Disqus.php b/user/vendors/hybridauth/Hybrid/Providers/Disqus.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Disqus.php rename to user/vendors/hybridauth/Hybrid/Providers/Disqus.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Facebook.php b/user/vendors/hybridauth/Hybrid/Providers/Facebook.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Facebook.php rename to user/vendors/hybridauth/Hybrid/Providers/Facebook.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Foursquare.php b/user/vendors/hybridauth/Hybrid/Providers/Foursquare.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Foursquare.php rename to user/vendors/hybridauth/Hybrid/Providers/Foursquare.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/GitHub.php b/user/vendors/hybridauth/Hybrid/Providers/GitHub.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/GitHub.php rename to user/vendors/hybridauth/Hybrid/Providers/GitHub.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Goodreads.php b/user/vendors/hybridauth/Hybrid/Providers/Goodreads.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Goodreads.php rename to user/vendors/hybridauth/Hybrid/Providers/Goodreads.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Google.php b/user/vendors/hybridauth/Hybrid/Providers/Google.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Google.php rename to user/vendors/hybridauth/Hybrid/Providers/Google.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Identica.php b/user/vendors/hybridauth/Hybrid/Providers/Identica.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Identica.php rename to user/vendors/hybridauth/Hybrid/Providers/Identica.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Instagram.php b/user/vendors/hybridauth/Hybrid/Providers/Instagram.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Instagram.php rename to user/vendors/hybridauth/Hybrid/Providers/Instagram.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/LastFM.php b/user/vendors/hybridauth/Hybrid/Providers/LastFM.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/LastFM.php rename to user/vendors/hybridauth/Hybrid/Providers/LastFM.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/LinkedIn.php b/user/vendors/hybridauth/Hybrid/Providers/LinkedIn.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/LinkedIn.php rename to user/vendors/hybridauth/Hybrid/Providers/LinkedIn.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Live.php b/user/vendors/hybridauth/Hybrid/Providers/Live.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Live.php rename to user/vendors/hybridauth/Hybrid/Providers/Live.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Mailru.php b/user/vendors/hybridauth/Hybrid/Providers/Mailru.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Mailru.php rename to user/vendors/hybridauth/Hybrid/Providers/Mailru.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Murmur.php b/user/vendors/hybridauth/Hybrid/Providers/Murmur.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Murmur.php rename to user/vendors/hybridauth/Hybrid/Providers/Murmur.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/MySpace.php b/user/vendors/hybridauth/Hybrid/Providers/MySpace.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/MySpace.php rename to user/vendors/hybridauth/Hybrid/Providers/MySpace.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Odnoklassniki.php b/user/vendors/hybridauth/Hybrid/Providers/Odnoklassniki.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Odnoklassniki.php rename to user/vendors/hybridauth/Hybrid/Providers/Odnoklassniki.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/OpenID.php b/user/vendors/hybridauth/Hybrid/Providers/OpenID.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/OpenID.php rename to user/vendors/hybridauth/Hybrid/Providers/OpenID.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Pixnet.php b/user/vendors/hybridauth/Hybrid/Providers/Pixnet.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Pixnet.php rename to user/vendors/hybridauth/Hybrid/Providers/Pixnet.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Plurk.php b/user/vendors/hybridauth/Hybrid/Providers/Plurk.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Plurk.php rename to user/vendors/hybridauth/Hybrid/Providers/Plurk.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/QQ.php b/user/vendors/hybridauth/Hybrid/Providers/QQ.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/QQ.php rename to user/vendors/hybridauth/Hybrid/Providers/QQ.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Sina.php b/user/vendors/hybridauth/Hybrid/Providers/Sina.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Sina.php rename to user/vendors/hybridauth/Hybrid/Providers/Sina.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Skyrock.php b/user/vendors/hybridauth/Hybrid/Providers/Skyrock.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Skyrock.php rename to user/vendors/hybridauth/Hybrid/Providers/Skyrock.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Steam.php b/user/vendors/hybridauth/Hybrid/Providers/Steam.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Steam.php rename to user/vendors/hybridauth/Hybrid/Providers/Steam.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Tumblr.php b/user/vendors/hybridauth/Hybrid/Providers/Tumblr.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Tumblr.php rename to user/vendors/hybridauth/Hybrid/Providers/Tumblr.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/TwitchTV.php b/user/vendors/hybridauth/Hybrid/Providers/TwitchTV.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/TwitchTV.php rename to user/vendors/hybridauth/Hybrid/Providers/TwitchTV.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Twitter.php b/user/vendors/hybridauth/Hybrid/Providers/Twitter.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Twitter.php rename to user/vendors/hybridauth/Hybrid/Providers/Twitter.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Viadeo.php b/user/vendors/hybridauth/Hybrid/Providers/Viadeo.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Viadeo.php rename to user/vendors/hybridauth/Hybrid/Providers/Viadeo.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Vimeo.php b/user/vendors/hybridauth/Hybrid/Providers/Vimeo.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Vimeo.php rename to user/vendors/hybridauth/Hybrid/Providers/Vimeo.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Vkontakte.php b/user/vendors/hybridauth/Hybrid/Providers/Vkontakte.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Vkontakte.php rename to user/vendors/hybridauth/Hybrid/Providers/Vkontakte.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Yahoo.php b/user/vendors/hybridauth/Hybrid/Providers/Yahoo.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Yahoo.php rename to user/vendors/hybridauth/Hybrid/Providers/Yahoo.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/Yandex.php b/user/vendors/hybridauth/Hybrid/Providers/Yandex.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/Yandex.php rename to user/vendors/hybridauth/Hybrid/Providers/Yandex.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Providers/px500.php b/user/vendors/hybridauth/Hybrid/Providers/px500.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Providers/px500.php rename to user/vendors/hybridauth/Hybrid/Providers/px500.php diff --git a/modules/user/vendors/hybridauth/Hybrid/Storage.php b/user/vendors/hybridauth/Hybrid/Storage.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/Storage.php rename to user/vendors/hybridauth/Hybrid/Storage.php diff --git a/modules/user/vendors/hybridauth/Hybrid/User.php b/user/vendors/hybridauth/Hybrid/User.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/User.php rename to user/vendors/hybridauth/Hybrid/User.php diff --git a/modules/user/vendors/hybridauth/Hybrid/User_Activity.php b/user/vendors/hybridauth/Hybrid/User_Activity.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/User_Activity.php rename to user/vendors/hybridauth/Hybrid/User_Activity.php diff --git a/modules/user/vendors/hybridauth/Hybrid/User_Contact.php b/user/vendors/hybridauth/Hybrid/User_Contact.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/User_Contact.php rename to user/vendors/hybridauth/Hybrid/User_Contact.php diff --git a/modules/user/vendors/hybridauth/Hybrid/User_Profile.php b/user/vendors/hybridauth/Hybrid/User_Profile.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/User_Profile.php rename to user/vendors/hybridauth/Hybrid/User_Profile.php diff --git a/modules/user/vendors/hybridauth/Hybrid/index.html b/user/vendors/hybridauth/Hybrid/index.html similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/index.html rename to user/vendors/hybridauth/Hybrid/index.html diff --git a/modules/user/vendors/hybridauth/Hybrid/resources/config.php.tpl b/user/vendors/hybridauth/Hybrid/resources/config.php.tpl similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/resources/config.php.tpl rename to user/vendors/hybridauth/Hybrid/resources/config.php.tpl diff --git a/modules/user/vendors/hybridauth/Hybrid/resources/index.html b/user/vendors/hybridauth/Hybrid/resources/index.html similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/resources/index.html rename to user/vendors/hybridauth/Hybrid/resources/index.html diff --git a/modules/user/vendors/hybridauth/Hybrid/resources/openid_policy.html b/user/vendors/hybridauth/Hybrid/resources/openid_policy.html similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/resources/openid_policy.html rename to user/vendors/hybridauth/Hybrid/resources/openid_policy.html diff --git a/modules/user/vendors/hybridauth/Hybrid/resources/openid_realm.html b/user/vendors/hybridauth/Hybrid/resources/openid_realm.html similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/resources/openid_realm.html rename to user/vendors/hybridauth/Hybrid/resources/openid_realm.html diff --git a/modules/user/vendors/hybridauth/Hybrid/resources/openid_xrds.xml b/user/vendors/hybridauth/Hybrid/resources/openid_xrds.xml similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/resources/openid_xrds.xml rename to user/vendors/hybridauth/Hybrid/resources/openid_xrds.xml diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php b/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Facebook/base_facebook.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/facebook.php b/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/facebook.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/facebook.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Facebook/facebook.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt b/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt rename to user/vendors/hybridauth/Hybrid/thirdparty/Facebook/fb_ca_chain_bundle.crt diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/LastFM/LastFM.php b/user/vendors/hybridauth/Hybrid/thirdparty/LastFM/LastFM.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/LastFM/LastFM.php rename to user/vendors/hybridauth/Hybrid/thirdparty/LastFM/LastFM.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php b/user/vendors/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php rename to user/vendors/hybridauth/Hybrid/thirdparty/LinkedIn/LinkedIn.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php b/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php rename to user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php b/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php rename to user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth1Client.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php b/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php rename to user/vendors/hybridauth/Hybrid/thirdparty/OAuth/OAuth2Client.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php b/user/vendors/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php rename to user/vendors/hybridauth/Hybrid/thirdparty/OpenID/LightOpenID.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Sina/Sina.php b/user/vendors/hybridauth/Hybrid/thirdparty/Sina/Sina.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Sina/Sina.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Sina/Sina.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Sina/saetv2.ex.class.php b/user/vendors/hybridauth/Hybrid/thirdparty/Sina/saetv2.ex.class.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Sina/saetv2.ex.class.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Sina/saetv2.ex.class.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Viadeo/ViadeoAPI.php b/user/vendors/hybridauth/Hybrid/thirdparty/Viadeo/ViadeoAPI.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Viadeo/ViadeoAPI.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Viadeo/ViadeoAPI.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/Vimeo/Vimeo.php b/user/vendors/hybridauth/Hybrid/thirdparty/Vimeo/Vimeo.php similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/Vimeo/Vimeo.php rename to user/vendors/hybridauth/Hybrid/thirdparty/Vimeo/Vimeo.php diff --git a/modules/user/vendors/hybridauth/Hybrid/thirdparty/index.html b/user/vendors/hybridauth/Hybrid/thirdparty/index.html similarity index 100% rename from modules/user/vendors/hybridauth/Hybrid/thirdparty/index.html rename to user/vendors/hybridauth/Hybrid/thirdparty/index.html diff --git a/modules/user/vendors/hybridauth/config.php b/user/vendors/hybridauth/config.php similarity index 100% rename from modules/user/vendors/hybridauth/config.php rename to user/vendors/hybridauth/config.php diff --git a/modules/user/vendors/hybridauth/index.php b/user/vendors/hybridauth/index.php similarity index 100% rename from modules/user/vendors/hybridauth/index.php rename to user/vendors/hybridauth/index.php diff --git a/modules/user/vendors/hybridauth/install.php b/user/vendors/hybridauth/install.php similarity index 100% rename from modules/user/vendors/hybridauth/install.php rename to user/vendors/hybridauth/install.php diff --git a/modules/user/views/csv/import.php b/user/views/csv/import.php similarity index 100% rename from modules/user/views/csv/import.php rename to user/views/csv/import.php diff --git a/modules/user/views/csv/select.php b/user/views/csv/select.php similarity index 100% rename from modules/user/views/csv/select.php rename to user/views/csv/select.php diff --git a/modules/user/views/install/start.php b/user/views/install/start.php similarity index 100% rename from modules/user/views/install/start.php rename to user/views/install/start.php diff --git a/modules/user/views/install/success.php b/user/views/install/success.php similarity index 100% rename from modules/user/views/install/success.php rename to user/views/install/success.php diff --git a/modules/user/views/layouts/login.php b/user/views/layouts/login.php similarity index 100% rename from modules/user/views/layouts/login.php rename to user/views/layouts/login.php diff --git a/modules/user/views/layouts/yum.php b/user/views/layouts/yum.php similarity index 100% rename from modules/user/views/layouts/yum.php rename to user/views/layouts/yum.php diff --git a/modules/user/views/statistics/statistics.php b/user/views/statistics/statistics.php similarity index 100% rename from modules/user/views/statistics/statistics.php rename to user/views/statistics/statistics.php diff --git a/modules/user/views/translation/_form.php b/user/views/translation/_form.php similarity index 100% rename from modules/user/views/translation/_form.php rename to user/views/translation/_form.php diff --git a/modules/user/views/translation/admin.php b/user/views/translation/admin.php similarity index 100% rename from modules/user/views/translation/admin.php rename to user/views/translation/admin.php diff --git a/modules/user/views/translation/create.php b/user/views/translation/create.php similarity index 100% rename from modules/user/views/translation/create.php rename to user/views/translation/create.php diff --git a/modules/user/views/translation/update.php b/user/views/translation/update.php similarity index 100% rename from modules/user/views/translation/update.php rename to user/views/translation/update.php diff --git a/modules/user/views/user/_activation_passwordform.php b/user/views/user/_activation_passwordform.php similarity index 100% rename from modules/user/views/user/_activation_passwordform.php rename to user/views/user/_activation_passwordform.php diff --git a/modules/user/views/user/_form.php b/user/views/user/_form.php similarity index 100% rename from modules/user/views/user/_form.php rename to user/views/user/_form.php diff --git a/modules/user/views/user/_miniform.php b/user/views/user/_miniform.php similarity index 100% rename from modules/user/views/user/_miniform.php rename to user/views/user/_miniform.php diff --git a/modules/user/views/user/_resend_activation_partial.php b/user/views/user/_resend_activation_partial.php similarity index 100% rename from modules/user/views/user/_resend_activation_partial.php rename to user/views/user/_resend_activation_partial.php diff --git a/modules/user/views/user/_tooltip.php b/user/views/user/_tooltip.php similarity index 100% rename from modules/user/views/user/_tooltip.php rename to user/views/user/_tooltip.php diff --git a/modules/user/views/user/_view.php b/user/views/user/_view.php similarity index 100% rename from modules/user/views/user/_view.php rename to user/views/user/_view.php diff --git a/modules/user/views/user/admin.php b/user/views/user/admin.php similarity index 100% rename from modules/user/views/user/admin.php rename to user/views/user/admin.php diff --git a/modules/user/views/user/browse.php b/user/views/user/browse.php similarity index 100% rename from modules/user/views/user/browse.php rename to user/views/user/browse.php diff --git a/modules/user/views/user/changepassword.php b/user/views/user/changepassword.php similarity index 100% rename from modules/user/views/user/changepassword.php rename to user/views/user/changepassword.php diff --git a/modules/user/views/user/confirmDeletion.php b/user/views/user/confirmDeletion.php similarity index 100% rename from modules/user/views/user/confirmDeletion.php rename to user/views/user/confirmDeletion.php diff --git a/modules/user/views/user/create.php b/user/views/user/create.php similarity index 100% rename from modules/user/views/user/create.php rename to user/views/user/create.php diff --git a/modules/user/views/user/foreignprofile.php b/user/views/user/foreignprofile.php similarity index 100% rename from modules/user/views/user/foreignprofile.php rename to user/views/user/foreignprofile.php diff --git a/modules/user/views/user/generate_data.php b/user/views/user/generate_data.php similarity index 100% rename from modules/user/views/user/generate_data.php rename to user/views/user/generate_data.php diff --git a/modules/user/views/user/index.php b/user/views/user/index.php similarity index 100% rename from modules/user/views/user/index.php rename to user/views/user/index.php diff --git a/modules/user/views/user/list.php b/user/views/user/list.php similarity index 100% rename from modules/user/views/user/list.php rename to user/views/user/list.php diff --git a/modules/user/views/user/login.php b/user/views/user/login.php similarity index 100% rename from modules/user/views/user/login.php rename to user/views/user/login.php diff --git a/modules/user/views/user/login_debug.php b/user/views/user/login_debug.php similarity index 100% rename from modules/user/views/user/login_debug.php rename to user/views/user/login_debug.php diff --git a/modules/user/views/user/message.php b/user/views/user/message.php similarity index 100% rename from modules/user/views/user/message.php rename to user/views/user/message.php diff --git a/modules/user/views/user/password_expired.php b/user/views/user/password_expired.php similarity index 100% rename from modules/user/views/user/password_expired.php rename to user/views/user/password_expired.php diff --git a/modules/user/views/user/passwordfields.php b/user/views/user/passwordfields.php similarity index 100% rename from modules/user/views/user/passwordfields.php rename to user/views/user/passwordfields.php diff --git a/modules/user/views/user/resend_activation.php b/user/views/user/resend_activation.php similarity index 100% rename from modules/user/views/user/resend_activation.php rename to user/views/user/resend_activation.php diff --git a/modules/user/views/user/restricted_admin.php b/user/views/user/restricted_admin.php similarity index 100% rename from modules/user/views/user/restricted_admin.php rename to user/views/user/restricted_admin.php diff --git a/modules/user/views/user/update.php b/user/views/user/update.php similarity index 100% rename from modules/user/views/user/update.php rename to user/views/user/update.php diff --git a/modules/user/views/user/view.php b/user/views/user/view.php similarity index 100% rename from modules/user/views/user/view.php rename to user/views/user/view.php diff --git a/modules/usergroup/UsergroupModule.php b/usergroup/UsergroupModule.php similarity index 100% rename from modules/usergroup/UsergroupModule.php rename to usergroup/UsergroupModule.php diff --git a/modules/usergroup/controllers/YumUsergroupController.php b/usergroup/controllers/YumUsergroupController.php similarity index 100% rename from modules/usergroup/controllers/YumUsergroupController.php rename to usergroup/controllers/YumUsergroupController.php diff --git a/modules/usergroup/models/YumGroupParticipation.php b/usergroup/models/YumGroupParticipation.php similarity index 100% rename from modules/usergroup/models/YumGroupParticipation.php rename to usergroup/models/YumGroupParticipation.php diff --git a/modules/usergroup/models/YumUsergroup.php b/usergroup/models/YumUsergroup.php similarity index 100% rename from modules/usergroup/models/YumUsergroup.php rename to usergroup/models/YumUsergroup.php diff --git a/modules/usergroup/models/YumUsergroupMessage.php b/usergroup/models/YumUsergroupMessage.php similarity index 100% rename from modules/usergroup/models/YumUsergroupMessage.php rename to usergroup/models/YumUsergroupMessage.php diff --git a/modules/usergroup/views/groups/_form.php b/usergroup/views/groups/_form.php similarity index 100% rename from modules/usergroup/views/groups/_form.php rename to usergroup/views/groups/_form.php diff --git a/modules/usergroup/views/groups/_message.php b/usergroup/views/groups/_message.php similarity index 100% rename from modules/usergroup/views/groups/_message.php rename to usergroup/views/groups/_message.php diff --git a/modules/usergroup/views/groups/_message_form.php b/usergroup/views/groups/_message_form.php similarity index 100% rename from modules/usergroup/views/groups/_message_form.php rename to usergroup/views/groups/_message_form.php diff --git a/modules/usergroup/views/groups/_miniform.php b/usergroup/views/groups/_miniform.php similarity index 100% rename from modules/usergroup/views/groups/_miniform.php rename to usergroup/views/groups/_miniform.php diff --git a/modules/usergroup/views/groups/_participant.php b/usergroup/views/groups/_participant.php similarity index 100% rename from modules/usergroup/views/groups/_participant.php rename to usergroup/views/groups/_participant.php diff --git a/modules/usergroup/views/groups/_search.php b/usergroup/views/groups/_search.php similarity index 100% rename from modules/usergroup/views/groups/_search.php rename to usergroup/views/groups/_search.php diff --git a/modules/usergroup/views/groups/_tooltip.php b/usergroup/views/groups/_tooltip.php similarity index 100% rename from modules/usergroup/views/groups/_tooltip.php rename to usergroup/views/groups/_tooltip.php diff --git a/modules/usergroup/views/groups/_view.php b/usergroup/views/groups/_view.php similarity index 100% rename from modules/usergroup/views/groups/_view.php rename to usergroup/views/groups/_view.php diff --git a/modules/usergroup/views/groups/admin.php b/usergroup/views/groups/admin.php similarity index 100% rename from modules/usergroup/views/groups/admin.php rename to usergroup/views/groups/admin.php diff --git a/modules/usergroup/views/groups/browse.php b/usergroup/views/groups/browse.php similarity index 100% rename from modules/usergroup/views/groups/browse.php rename to usergroup/views/groups/browse.php diff --git a/modules/usergroup/views/groups/create.php b/usergroup/views/groups/create.php similarity index 100% rename from modules/usergroup/views/groups/create.php rename to usergroup/views/groups/create.php diff --git a/modules/usergroup/views/groups/index.php b/usergroup/views/groups/index.php similarity index 100% rename from modules/usergroup/views/groups/index.php rename to usergroup/views/groups/index.php diff --git a/modules/usergroup/views/groups/success.php b/usergroup/views/groups/success.php similarity index 100% rename from modules/usergroup/views/groups/success.php rename to usergroup/views/groups/success.php diff --git a/modules/usergroup/views/groups/update.php b/usergroup/views/groups/update.php similarity index 100% rename from modules/usergroup/views/groups/update.php rename to usergroup/views/groups/update.php diff --git a/modules/usergroup/views/groups/view.php b/usergroup/views/groups/view.php similarity index 100% rename from modules/usergroup/views/groups/view.php rename to usergroup/views/groups/view.php diff --git a/views/layouts/main.php b/views/layouts/main.php deleted file mode 100644 index 9015d93..0000000 --- a/views/layouts/main.php +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - Yii User Management Demo Application> - - -
-
- -
-
- - - -
- -
- -
- - - - - - - - diff --git a/views/site/error.php b/views/site/error.php deleted file mode 100644 index 2930bf2..0000000 --- a/views/site/error.php +++ /dev/null @@ -1,13 +0,0 @@ -pageTitle=Yii::app()->name . ' - Error'; -$this->breadcrumbs=array( - 'Error', -); -?> - -

Error

- -
- -
diff --git a/views/site/index.php b/views/site/index.php deleted file mode 100644 index 4b05bd3..0000000 --- a/views/site/index.php +++ /dev/null @@ -1,21 +0,0 @@ -pageTitle=Yii::app()->name; ?> - -
-
-

Yii User Management Module

-
-
- -

This is the Demo Application.

- -

. - -

Also see:

- -