From 4e9440396cbff64e1ffbe3025a2e02baeb41f9c0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 11 Mar 2016 10:54:04 +0100 Subject: remove superfluous return --- mod/display.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index ac1de17ca..40427846b 100644 --- a/mod/display.php +++ b/mod/display.php @@ -329,6 +329,5 @@ function display_content(&$a, $update = 0, $load = false) { } */ - return $o; } -- cgit v1.2.3 From 6837c2ef1ebb18eb1cbf19603bfc8d6affce662b Mon Sep 17 00:00:00 2001 From: EinerVonVielen Date: Sat, 12 Mar 2016 21:46:13 +0100 Subject: Fix: German help > link to of project in github. The link Pointed to redmatrix. Now the link points to hubzilla. --- doc/de/general.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/de/general.bb b/doc/de/general.bb index 61cc955bb..eb1c0f158 100644 --- a/doc/de/general.bb +++ b/doc/de/general.bb @@ -7,8 +7,8 @@ [h3]Externe Ressourcen[/h3] [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl] -[url=https://github.com/redmatrix/redmatrix]Haupt-Website[/url] -[url=https://github.com/redmatrix/redmatrix-addons]Addons-Website[/url] +[url=https://github.com/redmatrix/hubzilla]Haupt-Website[/url] +[url=https://github.com/redmatrix/hubzilla-addons]Addons-Website[/url] [url=[baseurl]/help/credits]$Projectname Credits[/url] -- cgit v1.2.3 From 2d8deb60826a12b5bbe6ac1a8c123796c201d6fd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 12 Mar 2016 22:13:46 +0100 Subject: some janitor work on profiles --- include/datetime.php | 12 +++++++++++- mod/profiles.php | 29 ++++++++++++----------------- view/tpl/profile_edit.tpl | 31 ++++++------------------------- view/tpl/profile_hide_friends.tpl | 20 -------------------- 4 files changed, 29 insertions(+), 63 deletions(-) delete mode 100644 view/tpl/profile_hide_friends.tpl diff --git a/include/datetime.php b/include/datetime.php index 57b2b6d37..8ee70a6fa 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -119,6 +119,8 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d * @return string */ function dob($dob) { + $a = get_app(); + list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d'); $f = get_config('system', 'birthday_input_format'); if (! $f) @@ -129,7 +131,15 @@ function dob($dob) { else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); - $o = ''; + $o = replace_macros(get_markup_template("field_input.tpl"), array('$field' => array( + 'dob', + t('Birthday'), + $value, + ((intval($value)) ? t('Age: ') . age($value,$a->user['timezone'],$a->user['timezone']) : ''), + '', + 'placeholder="' . t('YYYY-MM-DD or MM-DD') .'"' + ))); + // if ($dob && $dob != '0000-00-00') // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); diff --git a/mod/profiles.php b/mod/profiles.php index 57d3561b1..f6d75bb7e 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -639,14 +639,13 @@ function profiles_content(&$a) { else $fields = $profile_fields_basic; - - $opt_tpl = get_markup_template("profile_hide_friends.tpl"); - $hide_friends = replace_macros($opt_tpl,array('$field' => array( - 'hide_friends', - t('Hide your contact/friend list from viewers of this profile?'), - $r[0]['hide_friends'], - '', - ))); + $hide_friends = array( + 'hide_friends', + t('Hide your contact/friend list from viewers of this profile?'), + $r[0]['hide_friends'], + '', + array(t('No'),t('Yes')) + ); $q = q("select * from profdef where true"); if($q) { @@ -672,6 +671,7 @@ function profiles_content(&$a) { $f = 'ymd'; $is_default = (($r[0]['is_default']) ? 1 : 0); + $tpl = get_markup_template("profile_edit.tpl"); $o .= replace_macros($tpl,array( @@ -695,11 +695,7 @@ function profiles_content(&$a) { '$exportable' => feature_enabled(local_channel(),'profile_export'), '$lbl_import' => t('Import profile from file'), '$lbl_export' => t('Export profile to file'), - '$lbl_profname' => t('Profile Name'), - '$lbl_fullname' => t('Your Full Name'), - '$lbl_title' => t('Title/Description'), '$lbl_gender' => t('Your Gender'), - '$lbl_bd' => t("Birthday"), '$lbl_address' => t('Street Address'), '$lbl_city' => t('Locality/City'), '$lbl_zip' => t('Postal/Zip Code'), @@ -733,12 +729,12 @@ function profiles_content(&$a) { '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => $a->get_baseurl(true), '$profile_id' => $r[0]['id'], - '$profile_name' => $r[0]['profile_name'], + '$profile_name' => array('profile_name', t('Profile Name'), $r[0]['profile_name'], '', '*'), '$is_default' => $is_default, '$default' => t('This is your default profile.') . EOL . translate_scope(map_scope($channel['channel_r_profile'])), '$advanced' => $advanced, - '$name' => $r[0]['name'], - '$pdesc' => $r[0]['pdesc'], + '$name' => array('name', t('Your Full Name'), $r[0]['name']), + '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']), '$dob' => dob($r[0]['dob']), '$hide_friends' => $hide_friends, '$address' => $r[0]['address'], @@ -746,9 +742,8 @@ function profiles_content(&$a) { '$region' => $r[0]['region'], '$postal_code' => $r[0]['postal_code'], '$country_name' => $r[0]['country_name'], - '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), '$gender' => gender_selector($r[0]['gender']), - '$gender_min' => gender_selector_min($r[0]['gender']), + '$gender_min' => gender_selector_min($r[0]['gender']), '$marital' => marital_selector($r[0]['marital']), '$marital_min' => marital_selector_min($r[0]['marital']), '$with' => $r[0]['with'], diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 26da4ebc9..f3f3efd6f 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -21,32 +21,19 @@ {{if $is_default}} -

{{$default}}

+
{{$default}}
{{/if}}
-
- - -
-
- -
- - -
-
+{{include file="field_input.tpl" field=$profile_name}} +{{include file="field_input.tpl" field=$name}} {{if $fields.pdesc}} -
- - -
-
+{{include file="field_input.tpl" field=$pdesc}} {{/if}} {{if $fields.gender}} @@ -62,16 +49,10 @@ {{/if}} {{if $fields.dob}} -
- -
-{{$dob}} {{$age}} -
-
-
+{{$dob}} {{/if}} -{{$hide_friends}} +{{include file="field_checkbox.tpl" field=$hide_friends}}
diff --git a/view/tpl/profile_hide_friends.tpl b/view/tpl/profile_hide_friends.tpl deleted file mode 100644 index 4ed6782bb..000000000 --- a/view/tpl/profile_hide_friends.tpl +++ /dev/null @@ -1,20 +0,0 @@ -{{include file="field_checkbox.tpl"}} - -{{* -

-{{$desc}} -

-
- - - -
-
- -
- - - -
-
-*}} -- cgit v1.2.3