Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php

diff --cc apps/contacts/ajax/saveproperty.php
index 3a50d18e6a6bfef8a947f37deadec1e538b67c60,c1d5cebfd06b8c22058a92b9b60f0fc7de5b1b9a..0769791ea3654962e75e7419d43225e5ee633110
--- 1/apps/contacts/ajax/saveproperty.php
--- 2/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@@ -128,14 -123,9 +128,8 @@@ switch($element) 
  $checksum = md5($vcard->children[$line]->serialize());
  debug('New checksum: '.$checksum);
  
- <<<<<<< HEAD
- if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
-       bailOut(OC_Contacts_App::$l10n->t('Error updating contact property.'));
- =======
  if(!OC_Contacts_VCard::edit($id,$vcard)) {
--      OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error updating contact property.'))));
--      OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
- >>>>>>> d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb
++      bailOut(OC_Contacts_App::$l10n->t('Error updating contact property.'));
        exit();
  }
  

diff --cc apps/contacts/index.php
index a7817d35e586bc62113a75718cc7e41d3a6b3d7d,b8dfc1b7709aba423bae2adf566b906b349a940b..48b2b8b4f019ac9709ad28fd32b279c2814b36e6
--- 1/apps/contacts/index.php
--- 2/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@@ -59,8 -59,8 +60,9 @@@ $tmpl = new OC_Template( "contacts", "i
  $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
  $tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
  $tmpl->assign('property_types',$property_types);
+ $tmpl->assign('categories',OC_Contacts_App::getCategories());
  $tmpl->assign('phone_types',$phone_types);
 +$tmpl->assign('categories',$categories);
  $tmpl->assign('addressbooks', $addressbooks);
  $tmpl->assign('contacts', $contacts);
  $tmpl->assign('details', $details );

diff --cc apps/contacts/js/contacts.js
index 483d2a228d1989e4a1bb371ef4a5e418d9769260,0c63b5fcb764d00c374d6cb5a26de9af838d210d..5f6129ca6542188e4faa27d443ab6ab23b16292a
--- 1/apps/contacts/js/contacts.js
--- 2/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@@ -252,12 -182,6 +252,12 @@@ Contacts=
                        $('#bday').datepicker({
                                                dateFormat : 'dd-mm-yy'
                        });
-                       $('#categories_value').find('select').multiselect({
++                      /*$('#categories_value').find('select').multiselect({
 +                                                                              noneSelectedText: t('contacts', 'Select categories'),
 +                                                                              header: false,
 +                                                                              selectedList: 6,
 +                                                                              classes: 'categories'
-                                                                       });
++                                                                      });*/
                        // Style phone types
                        $('#phonelist').find('select.contacts_property').multiselect({
                                                                                                        noneSelectedText: t('contacts', 'Select type'),
@@@ -437,27 -362,17 +438,27 @@@
                                this.data = jsondata;
                                this.id = this.data.id;
                                $('#rightcontent').data('id',this.id);
 -                              //console.log('loaded: ' + this.data.FN[0]['value']);
 +                              console.log('loaded: ' + this.data.FN[0]['value']);
                                this.populateNameFields();
--                              this.loadCategories();
++                              //this.loadCategories();
                                this.loadPhoto();
                                this.loadMails();
                                this.loadPhones();
                                this.loadAddresses();
                                this.loadSingleProperties();
 +                              // TODO: load NOTE ;-)
 +                              if(this.data.NOTE) {
 +                                      $('#note').data('checksum', this.data.NOTE[0]['checksum']);
 +                                      $('#note').find('textarea').val(this.data.NOTE[0]['value']);
 +                                      $('#note').show();
 +                              } else {
 +                                      $('#note').data('checksum', '');
 +                                      $('#note').find('textarea').val('');
 +                                      $('#note').hide();
 +                              }
                        },
                        loadSingleProperties:function() {
-                               var props = ['BDAY', 'NICKNAME', 'ORG'];
+                               var props = ['BDAY', 'NICKNAME', 'ORG', 'CATEGORIES'];
                                // Clear all elements
                                $('#ident .propertycontainer').each(function(){
                                        if(props.indexOf($(this).data('element')) > -1) {

diff --cc apps/contacts/lib/vcard.php
Simple merge

diff --cc apps/contacts/templates/part.contact.php
index 59bb6c2cc2911cd3141b8775424527b090a85ffc,783dc469075a2e192248b5363b9340f8bba46f73..115458470baf2e59fb117acee961c35ec2a810f7
--- 1/apps/contacts/templates/part.contact.php
--- 2/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@@ -13,7 -13,7 +13,8 @@@ $id = isset($_['id']) ? $_['id'] : ''
                <li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
                <li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
                <li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
 +              <li><a data-type="NOTE"><?php echo $l->t('Note'); ?></a></li>
+               <li><a data-type="CATEGORIES"><?php echo $l->t('Categories'); ?></a></li>
        </ul>
        </div>
        <img  onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
@@@ -54,19 -54,10 +55,21 @@@
                <dd style="display:none;" class="propertycontainer" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
                <dt style="display:none;" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
                <dd style="display:none;" class="propertycontainer" id="bday_value" data-element="BDAY"><input id="bday"  required="required" name="value" type="text" class="contacts_property" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
-               <dt id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Categories'); ?></label></dt>
 -              <dt style="display:none;" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Organization'); ?></label></dt>
 -              <dd style="display:none;" class="propertycontainer" id="categories_value" data-element="CATEGORIES"><input id="categories"  required="required" name="value[CATEGORIES]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Categories'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
++              <!-- dt id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Categories'); ?></label></dt>
 +              <dd class="propertycontainer" id="categories_value" data-element="CATEGORIES">
 +                      <select class="contacts_property" multiple="multiple" id="categories" name="value[]">
 +                              <?php echo html_select_options($_['categories'], array(), array('combine'=>true)) ?>
 +                      </select>
 +                      <a class="action edit" onclick="$(this).tipsy('hide');Categories.edit();" title="<?php echo $l->t('Edit categories'); ?>"></a>
-               </dd>
++              </dd -->
++              <dt style="display:none;" id="categories_label" data-element="CATEGORIES"><label for="categories"><?php echo $l->t('Categories'); ?></label></dt>
++              <dd style="display:none;" class="propertycontainer" id="categories_value" data-element="CATEGORIES"><input id="categories"  required="required" name="value[CATEGORIES]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Categories'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a><a class="action edit" onclick="$(this).tipsy('hide');Categories.edit();" title="<?php echo $l->t('Edit categories'); ?>"></a></dd>
        </dl>
        </fieldset>
 +      <fieldset id="note" class="formfloat propertycontainer" style="display:none;" data-element="NOTE">
 +      <legend><?php echo $l->t('Note'); ?></legend>
 +      <textarea class="contacts_property note" name="value"></textarea>
 +      </fieldset>
        </form>
        </div>