aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Connedit.php1
-rw-r--r--Zotlabs/Module/Profiles.php2
-rwxr-xr-xboot.php2
-rw-r--r--install/schema_mysql.sql1
-rw-r--r--install/schema_postgres.sql1
-rw-r--r--install/update.php13
-rw-r--r--view/css/mod_connedit.css1
-rwxr-xr-xview/tpl/abook_edit.tpl2
8 files changed, 18 insertions, 5 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 29471ed99..d60ffcd56 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -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'],
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 19a642a83..a1689e6ed 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -191,7 +191,7 @@ class Profiles extends \Zotlabs\Web\Controller {
}
}
- function post() {
+ function post() {
if(! local_channel()) {
notice( t('Permission denied.') . EOL);
diff --git a/boot.php b/boot.php
index 7531a45b2..7c8f54859 100755
--- a/boot.php
+++ b/boot.php
@@ -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 );
/**
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3f53ea907..bd7d9d79c 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -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`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 1a51ff718..f8e4ecf5f 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -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")
diff --git a/install/update.php b/install/update.php
index eca7011a8..34f23b049 100644
--- a/install/update.php
+++ b/install/update.php
@@ -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;
+
+
+} \ No newline at end of file
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index a6f6a3818..f1784721e 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -123,6 +123,5 @@ input.vcard-fn,
}
.connphone {
- font-size: 150%;
color: green;
} \ No newline at end of file
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 56ff75e69..069c38b52 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -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>