diff options
46 files changed, 150 insertions, 149 deletions
diff --git a/.travis.yml b/.travis.yml index 835672e8..680a7113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,13 @@ install: - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';" - cd .. - ocdev setup core --dir owncloud --branch $BRANCH --no-history -- mv contactsrework owncloud/apps -- phpenv config-add owncloud/apps/contactsrework/tests/travis/php.ini +- mv contacts owncloud/apps +- phpenv config-add owncloud/apps/contacts/tests/travis/php.ini - cd owncloud - "./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB" -- "./occ app:enable contactsrework" -- cd apps/contactsrework +- "./occ app:enable contacts" +- cd apps/contacts - npm install --deps script: - phpunit -c phpunit.xml @@ -46,9 +46,9 @@ deploy: provider: releases api_key: secure: IBNQc4MsBqOc6bj2fD1PnMFfELFpP2GqpZjmBsqP43dWixo8vZzafg7JwlsfnuC0rfcOE/2NwHQl43d+37sXMbMl+ZXgz2ax/wOyLAS2PK/EQEDkzYOdI0E/8u2D7V7m9LlCQ8MOGSGmjYwFcDLzcmgU8AOWg4N85ktpOkaiVF1287Rr+wcRZ0o4/VTVvykYzfKDIBaACAX+EaXtpBtD0cTr1lFN4vKuUma2+iX+MyPVZcvIbCWv2bTzqXzfkT3NagZuFXcooXhvPGFoOb8AisxRSoVP48Vpt8ziG+7wDFlIrNe+fjNJxOEMDEP8cYljoUU6MaOxcm012s/CqHjWBuTI5MRAWlH4w9YJ/1BhFoSJOUb21401zp255puPZJ+Vq8i720F21xm7g7Vc/1NsEAwmTzLgaG8cnV98SonITVDuR4qIaMWpHwTMhap6sHMW7UfH4QnCKypo1mgITFdjM9ANYbcfF8GBfrK4MZtuw75AcLoytFia+KnAOO7OpC93eo6Czcqu6ILOBz1XNWZcFQJTrkLKkFslZLhSSrgPrTL4Py0zVmBurxdOmoZkDcxyKmk/1ggQmZKhh7OS1TGW/7tckscwMhukLwnQiXBCQJ7VWAJ/2eaolym1+fDbqJ4z8t9q2KEfZyqlYAL4VxPqQzxwO9O19ej1WtncvpFHlQw= - file: build/artifacts/appstore/contactsrework.tar.gz + file: build/artifacts/appstore/contacts.tar.gz skip_cleanup: true on: - repo: owncloud/contactsrework + repo: owncloud/contacts tags: true php: 5.6 @@ -1,6 +1,6 @@ # Makefile for building the project -app_name=contactsrework +app_name=contacts project_dir=$(CURDIR)/../$(app_name) build_dir=$(CURDIR)/build/artifacts appstore_dir=$(build_dir)/appstore @@ -37,4 +37,4 @@ appstore_package: clean --exclude=$(project_dir)/.travis.yml \ --exclude=$(project_dir)/phpunit*xml \ --exclude=$(project_dir)/Makefile \ - --exclude=$(project_dir)/tests
\ No newline at end of file + --exclude=$(project_dir)/tests @@ -1,4 +1,4 @@ -# Contacts Rework +# Contacts Place this app in **owncloud/apps/** ## Publish to App Store @@ -12,4 +12,4 @@ The archive is located in build/artifacts/appstore and can then be uploaded to t ## Running tests After [Installing PHPUnit](http://phpunit.de/getting-started.html) run: - phpunit -c phpunit.xml
\ No newline at end of file + phpunit -c phpunit.xml diff --git a/appinfo/app.php b/appinfo/app.php index 10e59162..49f83da9 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -1,6 +1,6 @@ <?php /** - * ownCloud - contactsrework + * ownCloud - contacts * * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. @@ -9,11 +9,11 @@ * @copyright Hendrik Leppelsack 2015 */ -namespace OCA\ContactsRework\AppInfo; +namespace OCA\Contacts\AppInfo; use OCP\AppFramework\App; -$app = new App('contactsrework'); +$app = new App('contacts'); $container = $app->getContainer(); $container->query('OCP\INavigationManager')->add(function () use ($container) { @@ -21,18 +21,18 @@ $container->query('OCP\INavigationManager')->add(function () use ($container) { $l10n = $container->query('OCP\IL10N'); return [ // the string under which your app will be referenced in owncloud - 'id' => 'contactsrework', + 'id' => 'contacts', // sorting weight for the navigation. The higher the number, the higher // will it be listed in the navigation 'order' => 10, // the route that will be shown on startup - 'href' => $urlGenerator->linkToRoute('contactsrework.page.index'), + 'href' => $urlGenerator->linkToRoute('contacts.page.index'), // the icon that will be shown in the navigation // this file needs to exist in img/ - 'icon' => $urlGenerator->imagePath('contactsrework', 'app.svg'), + 'icon' => $urlGenerator->imagePath('contacts', 'app.svg'), // the title of your application. This will be used in the // navigation or on the settings page of your app diff --git a/appinfo/info.xml b/appinfo/info.xml index bfe60cc6..dc0b54b3 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,12 +1,11 @@ <?xml version="1.0"?> <info> - <id>contactsrework</id> + <id>contacts</id> <name>Contacts</name> <description>The new and improved app for your Contacts.</description> <licence>AGPL</licence> <author>Hendrik Leppelsack</author> <version>0.0.1</version> - <namespace>ContactsRework</namespace> <category>other</category> <dependencies> <owncloud min-version="9.0" max-version="9.0" /> diff --git a/appinfo/routes.php b/appinfo/routes.php index 5998bf47..edea0e49 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -1,6 +1,6 @@ <?php /** - * ownCloud - contactsrework + * ownCloud - contacts * * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. @@ -12,7 +12,7 @@ /** * Create your routes in here. The name is the lowercase name of the controller * without the controller part, the stuff after the hash is the method. - * e.g. page#index -> OCA\ContactsRework\Controller\PageController->index() + * e.g. page#index -> OCA\Contacts\Controller\PageController->index() * * The controller class has to be registered in the application.php file since * it's instantiated in there @@ -22,4 +22,4 @@ return [ ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], ['name' => 'page#do_echo', 'url' => '/echo', 'verb' => 'POST'], ] -];
\ No newline at end of file +]; @@ -1,5 +1,5 @@ { - "name": "contactsrework", + "name": "contacts", "authors": [ "Hendrik Leppelsack <hendrik@leppelsack.de>" ], diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index af53a9c1..b3810639 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -1,6 +1,6 @@ <?php /** - * ownCloud - contactsrework + * ownCloud - contacts * * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. @@ -9,7 +9,7 @@ * @copyright Hendrik Leppelsack 2015 */ -namespace OCA\ContactsRework\Controller; +namespace OCA\Contacts\Controller; use OCP\IRequest; use OCP\AppFramework\Http\TemplateResponse; @@ -38,7 +38,7 @@ class PageController extends Controller { */ public function index() { $params = ['user' => $this->userId]; - return new TemplateResponse('contactsrework', 'main', $params); // templates/main.php + return new TemplateResponse('contacts', 'main', $params); // templates/main.php } /** @@ -50,4 +50,4 @@ class PageController extends Controller { } -}
\ No newline at end of file +} diff --git a/css/public/style.css b/css/public/style.css index 1527c120..61889d1e 100644 --- a/css/public/style.css +++ b/css/public/style.css @@ -166,7 +166,7 @@ ul.dropdown-menu li.active { background: #eee; } -div.app-contactsrework span.utils { +div.app-contacts span.utils { padding: 0 !important; } diff --git a/js/components/addressBook/addressBook_directive.js b/js/components/addressBook/addressBook_directive.js index 01508d14..2073c152 100644 --- a/js/components/addressBook/addressBook_directive.js +++ b/js/components/addressBook/addressBook_directive.js @@ -7,6 +7,6 @@ app.directive('addressbook', function() { bindToController: { addressBook: "=data" }, - templateUrl: OC.linkTo('contactsrework', 'templates/addressBook.html') + templateUrl: OC.linkTo('contacts', 'templates/addressBook.html') }; -});
\ No newline at end of file +}); diff --git a/js/components/addressBookList/addressBookList_directive.js b/js/components/addressBookList/addressBookList_directive.js index 638dac56..f20fcc1f 100644 --- a/js/components/addressBookList/addressBookList_directive.js +++ b/js/components/addressBookList/addressBookList_directive.js @@ -5,6 +5,6 @@ app.directive('addressbooklist', function() { controller: 'addressbooklistCtrl', controllerAs: 'ctrl', bindToController: {}, - templateUrl: OC.linkTo('contactsrework', 'templates/addressBookList.html') + templateUrl: OC.linkTo('contacts', 'templates/addressBookList.html') }; }); diff --git a/js/components/contact/contact_directive.js b/js/components/contact/contact_directive.js index 4924bd9c..db96b5f8 100644 --- a/js/components/contact/contact_directive.js +++ b/js/components/contact/contact_directive.js @@ -6,6 +6,6 @@ app.directive('contact', function() { bindToController: { contact: '=data' }, - templateUrl: OC.linkTo('contactsrework', 'templates/contact.html') + templateUrl: OC.linkTo('contacts', 'templates/contact.html') }; }); diff --git a/js/components/contactDetails/contactDetails_controller.js b/js/components/contactDetails/contactDetails_controller.js index 1f9eed0f..247b1145 100644 --- a/js/components/contactDetails/contactDetails_controller.js +++ b/js/components/contactDetails/contactDetails_controller.js @@ -3,8 +3,8 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService' ctrl.uid = $routeParams.uid; ctrl.t = { - noContacts : t('contactsrework', 'No contacts in here'), - placeholderName : t('contactsrework', 'Name') + noContacts : t('contacts', 'No contacts in here'), + placeholderName : t('contacts', 'Name') }; ctrl.fieldDefinitions = vCardPropertiesService.fieldDefinitions; diff --git a/js/components/contactDetails/contactDetails_directive.js b/js/components/contactDetails/contactDetails_directive.js index a547e1a9..2b32fd18 100644 --- a/js/components/contactDetails/contactDetails_directive.js +++ b/js/components/contactDetails/contactDetails_directive.js @@ -5,6 +5,6 @@ app.directive('contactdetails', function() { controller: 'contactdetailsCtrl', controllerAs: 'ctrl', bindToController: {}, - templateUrl: OC.linkTo('contactsrework', 'templates/contactDetails.html') + templateUrl: OC.linkTo('contacts', 'templates/contactDetails.html') }; }); diff --git a/js/components/contactList/contactList_controller.js b/js/components/contactList/contactList_controller.js index f1e971c7..d458c914 100644 --- a/js/components/contactList/contactList_controller.js +++ b/js/components/contactList/contactList_controller.js @@ -3,7 +3,7 @@ app.controller('contactlistCtrl', ['$scope', '$filter', '$route', '$routeParams' ctrl.routeParams = $routeParams; ctrl.t = { - addContact : t('contactsrework', 'Add contact') + addContact : t('contacts', 'Add contact') }; ctrl.contactList = []; diff --git a/js/components/contactList/contactList_directive.js b/js/components/contactList/contactList_directive.js index a2941731..1cfe18ce 100644 --- a/js/components/contactList/contactList_directive.js +++ b/js/components/contactList/contactList_directive.js @@ -7,6 +7,6 @@ app.directive('contactlist', function() { bindToController: { addressbook: '=adrbook' }, - templateUrl: OC.linkTo('contactsrework', 'templates/contactList.html') + templateUrl: OC.linkTo('contacts', 'templates/contactList.html') }; -});
\ No newline at end of file +}); diff --git a/js/components/detailsItem/detailsItem_controller.js b/js/components/detailsItem/detailsItem_controller.js index 0079cbe7..cbc40dc8 100644 --- a/js/components/detailsItem/detailsItem_controller.js +++ b/js/components/detailsItem/detailsItem_controller.js @@ -3,7 +3,7 @@ app.controller('detailsItemCtrl', ['$templateRequest', 'vCardPropertiesService', ctrl.meta = vCardPropertiesService.getMeta(ctrl.name); ctrl.t = { - country : t('contactsrework', 'Country'), + country : t('contacts', 'Country'), }; ctrl.availableOptions = ctrl.meta.options || []; @@ -16,7 +16,7 @@ app.controller('detailsItemCtrl', ['$templateRequest', 'vCardPropertiesService', console.log(ctrl); ctrl.getTemplate = function() { - var templateUrl = OC.linkTo('contactsrework', 'templates/detailItems/'+ ctrl.meta.template +'.html'); + var templateUrl = OC.linkTo('contacts', 'templates/detailItems/'+ ctrl.meta.template +'.html'); return $templateRequest(templateUrl); }; }]); diff --git a/js/components/group/group_directive.js b/js/components/group/group_directive.js index f7694543..d7b53846 100644 --- a/js/components/group/group_directive.js +++ b/js/components/group/group_directive.js @@ -7,6 +7,6 @@ app.directive('group', function() { bindToController: { group: "=data" }, - templateUrl: OC.linkTo('contactsrework', 'templates/group.html') + templateUrl: OC.linkTo('contacts', 'templates/group.html') }; }); diff --git a/js/components/groupList/groupList_controller.js b/js/components/groupList/groupList_controller.js index 8ec58262..2e1b01c8 100644 --- a/js/components/groupList/groupList_controller.js +++ b/js/components/groupList/groupList_controller.js @@ -1,6 +1,6 @@ app.controller('grouplistCtrl', ['$scope', 'ContactService', '$routeParams', function($scope, ContactService, $routeParams) { - $scope.groups = [t('contactsrework', 'All contacts')]; + $scope.groups = [t('contacts', 'All contacts')]; ContactService.getGroups().then(function(groups) { $scope.groups = groups; diff --git a/js/components/groupList/groupList_directive.js b/js/components/groupList/groupList_directive.js index 87a8a6b6..748a3671 100644 --- a/js/components/groupList/groupList_directive.js +++ b/js/components/groupList/groupList_directive.js @@ -5,6 +5,6 @@ app.directive('grouplist', function() { controller: 'grouplistCtrl', controllerAs: 'ctrl', bindToController: {}, - templateUrl: OC.linkTo('contactsrework', 'templates/groupList.html') + templateUrl: OC.linkTo('contacts', 'templates/groupList.html') }; }); diff --git a/js/filters/contactGroup_filter.js b/js/filters/contactGroup_filter.js index eb6413e4..2829b490 100644 --- a/js/filters/contactGroup_filter.js +++ b/js/filters/contactGroup_filter.js @@ -5,7 +5,7 @@ app.filter('contactGroupFilter', [ if (typeof contacts === "undefined") { return contacts; } - if (typeof group === "undefined" || group.toLowerCase() === t('contactsrework', 'All contacts').toLowerCase()) { + if (typeof group === "undefined" || group.toLowerCase() === t('contacts', 'All contacts').toLowerCase()) { return contacts; } var filter = []; @@ -1,5 +1,5 @@ /** - * ownCloud - contactsrework + * ownCloud - contacts * * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. @@ -20,6 +20,6 @@ app.config(['$routeProvider', function($routeProvider){ template: '<contactdetails></contactdetails>' }); - $routeProvider.otherwise("/" + t('contactsrework', 'All contacts')); + $routeProvider.otherwise("/" + t('contacts', 'All contacts')); }]); diff --git a/js/public/script.js b/js/public/script.js index 6c53ed98..559d79e1 100644 --- a/js/public/script.js +++ b/js/public/script.js @@ -1,5 +1,5 @@ /** - * ownCloud - contactsrework + * ownCloud - contacts * * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. @@ -20,7 +20,7 @@ app.config(['$routeProvider', function($routeProvider){ template: '<contactdetails></contactdetails>' }); - $routeProvider.otherwise("/" + t('contactsrework', 'All contacts')); + $routeProvider.otherwise("/" + t('contacts', 'All contacts')); }]); @@ -139,9 +139,10 @@ app.directive('addressbook', function() { bindToController: { addressBook: "=data" }, - templateUrl: OC.linkTo('contactsrework', 'templates/addressBook.html') + templateUrl: OC.linkTo('contacts', 'templates/addressBook.html') }; }); + app.controller('addressbooklistCtrl', ['$scope', 'AddressBookService', 'SettingsService', function(scope, AddressBookService, SettingsService) { var ctrl = this; @@ -164,7 +165,7 @@ app.directive('addressbooklist', function() { controller: 'addressbooklistCtrl', controllerAs: 'ctrl', bindToController: {}, - templateUrl: OC.linkTo('contactsrework', 'templates/addressBookList.html') + templateUrl: OC.linkTo('contacts', 'templates/addressBookList.html') }; }); @@ -189,7 +190,7 @@ app.directive('contact', function() { bindToController: { contact: '=data' }, - templateUrl: OC.linkTo('contactsrework', 'templates/contact.html') + templateUrl: OC.linkTo('contacts', 'templates/contact.html') }; }); @@ -198,8 +199,8 @@ app.controller('contactdetailsCtrl', ['ContactService', 'vCardPropertiesService' ctrl.uid = $routeParams.uid; ctrl.t = { - noContacts : t('contactsrework', 'No contacts in here'), - placeholderName : t('contactsrework', 'Name') + noContacts : t('contacts', 'No contacts in here'), + placeholderName : t('contacts', 'Name') }; ctrl.fieldDefinitions = vCardPropertiesService.fieldDefinitions; @@ -242,7 +243,7 @@ app.directive('contactdetails', function() { controller: 'contactdetailsCtrl', controllerAs: 'ctrl', bindToController: {}, - templateUrl: OC.linkTo('contactsrework', 'templates/contactDetails.html') + templateUrl: OC.linkTo('contacts', 'templates/contactDetails.html') }; }); @@ -251,7 +252,7 @@ app.controller('contactlistCtrl', ['$scope', '$filter', '$route', '$routeParams' ctrl.routeParams = $routeParams; ctrl.t = { - addContact : t('contactsrework', 'Add contact') + addContact : t('contacts', 'Add contact') }; ctrl.contactList = []; @@ -316,15 +317,16 @@ app.directive('contactlist', function() { bindToController: { addressbook: '=adrbook' }, - templateUrl: OC.linkTo('contactsrework', 'templates/contactList.html') + templateUrl: OC.linkTo('contacts', 'templates/contactList.html') }; }); |