harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more vcard work

Browse Source
This commit is contained in:
zotlabs 2016-12-21 15:03:33 -08:00
parent fcc92299eb
commit bb85e139f1
8 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Connedit.php
View File

@ -832,6 +832,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$permnote_self' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'),
'$lastupdtext' => t('Last update:'),
'$last_update' => relative_date($contact['abook_connected']),
'$is_mobile' => ((\App::$is_mobile || \App::$is_tablet) ? true : false),
'$profile_select' => contact_profile_assign($contact['abook_profile']),
'$multiprofs' => $multiprofs,
'$contact_id' => $contact['abook_id'],

2
Zotlabs/Module/Profiles.php
View File

@ -191,7 +191,7 @@ class Profiles extends \Zotlabs\Web\Controller {
}
}
function post() {
function post() {
if(! local_channel()) {
notice( t('Permission denied.') . EOL);

2
boot.php
View File

@ -51,7 +51,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.1' );
define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1186 );
define ( 'DB_UPDATE_VERSION', 1187 );
/**

1
install/schema_mysql.sql
View File

@ -1059,6 +1059,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`photo` char(255) NOT NULL DEFAULT '',
`thumb` char(255) NOT NULL DEFAULT '',
`publish` tinyint(1) NOT NULL DEFAULT '0',
`profile_vcard` text NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
UNIQUE KEY `guid` (`profile_guid`,`uid`),
KEY `uid` (`uid`),

1
install/schema_postgres.sql
View File

@ -1043,6 +1043,7 @@ CREATE TABLE "profile" (
"photo" text NOT NULL,
"thumb" text NOT NULL,
"publish" numeric(1) NOT NULL DEFAULT '0',
"profile_vcard" text NOT NULL DEFAULT '',
PRIMARY KEY ("id"),
UNIQUE ("profile_guid","uid")

13
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1186 );
define( 'UPDATE_VERSION' , 1187 );
/**
*
@ -2481,3 +2481,14 @@ function update_r1185() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
function update_r1186() {
$r1 = q("alter table profile add profile_vcard text not null default '' ");
if($r1)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

1
view/css/mod_connedit.css
View File

@ -123,6 +123,5 @@ input.vcard-fn,
}
.connphone {
font-size: 150%;
color: green;
}

2
view/tpl/abook_edit.tpl
View File

@ -204,7 +204,7 @@
<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}} <a href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a></span>{{/if}}
{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-default btn-xs" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
</span>
<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
</div>