diff options
| author | John Molakvoæ <malabarth@hotmail.fr> | 2016-03-22 15:14:09 +0100 |
|---|---|---|
| committer | fs654 <feszfeds@yopmail.com> | 2016-03-23 16:15:56 +0100 |
| commit | ab93541521dd5c58cdb936d74d0595a8ff573090 (patch) | |
| tree | 10d01194b4f504fde195044e964a9451cee84e69 | |
| parent | c417c57e9ec7642453908f2ddaa057627e16739c (diff) | |
Translation and import button update
| -rw-r--r-- | css/public/style.css | 16 | ||||
| -rw-r--r-- | js/components/addressBookList/addressBookList_controller.js | 4 | ||||
| -rw-r--r-- | templates/addressBookList.html | 2 | ||||
| -rw-r--r-- | templates/main.php | 11 |
4 files changed, 27 insertions, 6 deletions
diff --git a/css/public/style.css b/css/public/style.css index e2f64501..a80ff166 100644 --- a/css/public/style.css +++ b/css/public/style.css @@ -284,8 +284,20 @@ li.addressBook-share-item span.shareeIdentifier { vertical-align: top; } - - +#app-settings-content #upload.button { + padding: 5px 40px 5px 20px; + background-position-x: 80px; + position: absolute; + top: 2px; + right: 2px; +} +#app-settings-content #upload.button .icon-upload { + display: block; + right: 16px; + position: absolute; + top: 7px; + opacity: 0.5; +} diff --git a/js/components/addressBookList/addressBookList_controller.js b/js/components/addressBookList/addressBookList_controller.js index 698a5f0a..8bad3b74 100644 --- a/js/components/addressBookList/addressBookList_controller.js +++ b/js/components/addressBookList/addressBookList_controller.js @@ -9,6 +9,10 @@ angular.module('contactsApp') ctrl.loading = false; }); + ctrl.t = { + addressBookName : t('contacts', 'Address book name') + }; + ctrl.createAddressBook = function() { if(ctrl.newAddressBookName) { AddressBookService.create(ctrl.newAddressBookName).then(function() { diff --git a/templates/addressBookList.html b/templates/addressBookList.html index 1cdb551f..ec0d277c 100644 --- a/templates/addressBookList.html +++ b/templates/addressBookList.html @@ -3,7 +3,7 @@ <li ng-repeat="addressBook in ctrl.addressBooks" addressbook data="addressBook"></li> <li> <form ng-submit="ctrl.createAddressBook()"> - <input id="newList" placeholder="Adressbook name" class="newAddressBookInput" ng-model="ctrl.newAddressBookName" type="text" /> + <input id="newList" placeholder="{{ctrl.t.addressBookName}}" class="newAddressBookInput" ng-model="ctrl.newAddressBookName" type="text" /> <input type="submit" value="" class="newAddressBookSubmit icon-confirm action pull-right" /> </form> </li> diff --git a/templates/main.php b/templates/main.php index 31dd0e46..cfba3215 100644 --- a/templates/main.php +++ b/templates/main.php @@ -31,12 +31,17 @@ vendor_style('select2/select2'); <div id="app-settings"> <div id="app-settings-header"> <button class="settings-button" - data-apps-slide-toggle="#app-settings-content" - >Settings</button> + data-apps-slide-toggle="#app-settings-content"> + <?php p($l->t('Settings'));?> + </button> </div> <div id="app-settings-content"> <addressBookList></addressBookList> - <input type="file" id="contact-import" class="hidden-visually" contactimport /><label for="contact-import">Import</label> + <input type="file" id="contact-import" class="hidden-visually" contactimport /> + <label for="contact-import" class="button" id="upload"> + <?php p($l->t('Import'));?> + <span class="icon-upload"></span> + </label> </div> </div> </div> |