rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

Browse Source
This commit is contained in:
babelouest 2014-04-10 23:33:17 -04:00
commit cffc06cc47
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/contacts.css
View File

@ -227,6 +227,13 @@
button.ui-multiselect { width: 300px !important; padding: 6px 0 0 6px; height: 30px; font-weight: normal; } /* No idea why this is needed? */
span.ui-icon { margin: 1px 3px 10px 0px; }
/* Use jquery-ui.datepickers own styling */
.ui-datepicker-title > select {
background-color: inherit;
color: inherit;
border: none;
}
#content .multiselectoptions > li > * {
-webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box;
color: #888888;

4
js/app.js
View File

@ -1533,6 +1533,10 @@ OC.notify = function(params) {
console.log('selected element', $listElement);
window.location.hash = this.currentid;
$contactelem.insertAfter($listElement).show().find('.fullname').focus();
// Remove once IE8 is finally obsoleted in oC.
if (!OC.Util.hasSVGSupport()) {
OC.Util.replaceSVG($contactelem);
}
self.jumpToContact(self.currentid);
$listElement.hide();
setTimeout(function() {

4
js/contacts.js
View File

@ -1325,7 +1325,9 @@ OC.Contacts = OC.Contacts || {};
var $bdayinput = this.$fullelem.find('[data-element="bday"]').find('input');
$bdayinput.datepicker({
dateFormat : datepickerFormatDate
dateFormat : datepickerFormatDate,
changeMonth: true,
changeYear: true
});
$bdayinput.attr('placeholder', $.datepicker.formatDate(datepickerFormatDate, new Date()));

3
lib/carddav/addressbook.php
View File

@ -48,7 +48,8 @@ class AddressBook extends \Sabre_CardDAV_AddressBook {
*/
public function __construct(
\Sabre_CardDAV_Backend_Abstract $carddavBackend,
array $addressBookInfo) {
array $addressBookInfo
) {
$this->carddavBackend = $carddavBackend;
$this->addressBookInfo = $addressBookInfo;

6
lib/dispatcher.php
View File

@ -56,15 +56,19 @@ class Dispatcher extends MainApp {
$this->appName = 'contacts';
parent::__construct($this->appName, $params);
$this->container = $this->getContainer();
$this->container->registerMiddleware(new HttpMiddleware());
$this->server = $this->container->getServer();
$this->app = new App($this->container->query('API')->getUserId());
$this->registerServices();
$this->container->registerMiddleware('HttpMiddleware');
}
public function registerServices() {
$app = $this->app;
$this->container->registerService('HttpMiddleware', function($container) {
return new HttpMiddleware();
});
$this->container->registerService('PageController', function(IAppContainer $container) use($app) {
$request = $container->query('Request');
return new PageController($this->appName, $request);

8
templates/contacts.php
View File

@ -229,10 +229,10 @@ use OCA\Contacts\ImportManager;
<li>
<div id="photowrapper" class="propertycontainer" data-element="photo">
<ul id="phototools" class="transparent hidden">
<li><a class="icon-delete action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="icon-rename action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="icon-upload action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="icon-folder action cloud icon-cloud" title="<?php echo $l->t('Select photo from Files'); ?>"></a></li>
<li><a class="svg icon-delete action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="svg icon-rename action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="svg icon-upload action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="svg icon-folder action cloud icon-cloud" title="<?php echo $l->t('Select photo from Files'); ?>"></a></li>
</ul>
<a class="favorite {favorite} tooltipped" title="<?php echo $l->t('Favorite'); ?>"></a>
</div>