From: rabuzarus <>
Date: Fri, 10 Jun 2016 09:24:38 +0000 (+0200)
Subject: frio + core: some restructure in profiles.php + frio template for profiles settings
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3a9a9e6a1c07c253bfbe6d437d1311497e947086;p=friendica.git
frio + core: some restructure in profiles.php + frio template for profiles settings
---
diff --git a/include/datetime.php b/include/datetime.php
index 89305a2406..e27f54e09c 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -162,7 +162,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
* @brief Wrapper for date selector, tailored for use in birthday fields.
*
* @param string $dob Date of Birth
- * @return string
+ * @return string Formatted html
*/
function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
@@ -175,7 +175,18 @@ function dob($dob) {
else
$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
- $o = '♥ Marital Status:'),
- '$lbl_with' => t("Who: \x28if applicable\x29"),
- '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
- '$lbl_howlong' => t('Since [date]:'),
'$lbl_sexual' => t('Sexual Preference:'),
- '$lbl_homepage' => t('Homepage URL:'),
- '$lbl_hometown' => t('Hometown:'),
- '$lbl_politic' => t('Political Views:'),
- '$lbl_religion' => t('Religious Views:'),
- '$lbl_pubkey' => t('Public Keywords:'),
- '$lbl_prvkey' => t('Private Keywords:'),
- '$lbl_likes' => t('Likes:'),
- '$lbl_dislikes' => t('Dislikes:'),
'$lbl_ex2' => t('Example: fishing photography software'),
- '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
- '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
- '$lbl_about' => t('Tell us about yourself...'),
- '$lbl_hobbies' => t('Hobbies/Interests'),
- '$lbl_social' => t('Contact information and Social Networks'),
- '$lbl_music' => t('Musical interests'),
- '$lbl_book' => t('Books, literature'),
- '$lbl_tv' => t('Television'),
- '$lbl_film' => t('Film/dance/culture/entertainment'),
- '$lbl_love' => t('Love/romance'),
- '$lbl_work' => t('Work/employment'),
- '$lbl_school' => t('School/education'),
+
'$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'], t('Required'), '*'),
+ '$is_default' => $is_default,
'$default' => (($is_default) ? '' . t('This is your public profile.may be visible to anybody using the internet.') . '
' : ""),
- '$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'],
- '$locality' => $r[0]['locality'],
- '$region' => $r[0]['region'],
- '$postal_code' => $r[0]['postal-code'],
- '$country_name' => $r[0]['country-name'],
+ '$address' => array('address', t('Street Address:'), $r[0]['address']),
+ '$locality' => array('locality', t('Locality/City:'), $r[0]['locality']),
+ '$region' => array('region', t('Region/State:'), $r[0]['region']),
+ '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
+ '$country_name' => array('country_name', t('Country:'), $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']),
'$marital' => marital_selector($r[0]['marital']),
- '$with' => strip_tags($r[0]['with']),
- '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
+ '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
+ '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
'$sexual' => sexpref_selector($r[0]['sexual']),
- '$about' => $r[0]['about'],
- '$homepage' => $r[0]['homepage'],
- '$hometown' => $r[0]['hometown'],
- '$politic' => $r[0]['politic'],
- '$religion' => $r[0]['religion'],
- '$pub_keywords' => $r[0]['pub_keywords'],
- '$prv_keywords' => $r[0]['prv_keywords'],
- '$likes' => $r[0]['likes'],
- '$dislikes' => $r[0]['dislikes'],
- '$music' => $r[0]['music'],
- '$book' => $r[0]['book'],
- '$tv' => $r[0]['tv'],
- '$film' => $r[0]['film'],
- '$interest' => $r[0]['interest'],
- '$romance' => $r[0]['romance'],
- '$work' => $r[0]['work'],
- '$education' => $r[0]['education'],
- '$contact' => $r[0]['contact']
+ '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
+ '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),
+ '$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']),
+ '$politic' => array('politic', t('Political Views:'), $r[0]['politic']),
+ '$religion' => array('religion', t('Religious Views:'), $r[0]['religion']),
+ '$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")),
+ '$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")),
+ '$likes' => array('likes', t('Likes:'), $r[0]['likes']),
+ '$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']),
+ '$music' => array('music', t('Musical interests'), $r[0]['music']),
+ '$book' => array('book', t('Books, literature'), $r[0]['book']),
+ '$tv' => array('tv', t('Television'), $r[0]['tv']),
+ '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
+ '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
+ '$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
+ '$work' => array('work', t('Work/employment'), $r[0]['work']),
+ '$education' => array('education', t('School/education'), $r[0]['education']),
+ '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
+
+ //eigene
+
));
$arr = array('profile' => $r[0], 'entry' => $o);
@@ -791,19 +772,9 @@ function profiles_content(&$a) {
local_user());
if(count($r)) {
- $tpl_header = get_markup_template('profile_listing_header.tpl');
- $o .= replace_macros($tpl_header,array(
- '$header' => t('Edit/Manage Profiles'),
- '$chg_photo' => t('Change profile photo'),
- '$cr_new' => t('Create New Profile'),
- '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
- ));
-
-
$tpl = get_markup_template('profile_entry.tpl');
-
foreach($r as $rr) {
- $o .= replace_macros($tpl, array(
+ $profiles .= replace_macros($tpl, array(
'$photo' => $a->remove_baseurl($rr['thumb']),
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
@@ -812,6 +783,15 @@ function profiles_content(&$a) {
: '
{{$field.1}}
-
+
{{$field.3}}
diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl
index 76445685d5..4623c77a8b 100644
--- a/view/templates/profile_edit.tpl
+++ b/view/templates/profile_edit.tpl
@@ -24,20 +24,20 @@
{{if $detailled_profile}}
{{include file="field_yesno.tpl" field=$details}}
-
{{$lbl_profname}}
-
*
+
{{$profile_name.1}}
+
*
-{{$lbl_fullname}}
-{{$name.1}}
+
-{{$lbl_title}}
-{{$pdesc.1}}
+
@@ -49,10 +49,7 @@
-
{{$lbl_bd}}
-
-{{$dob}} {{$age}}
-
+{{$dob}}
@@ -65,45 +62,45 @@
-{{$lbl_address}}
-{{$address.1}}
+
-{{$lbl_city}}
-{{$locality.1}}
+
-{{$lbl_zip}}
-{{$postal_code.1}}
+
-{{$lbl_country}}
-
-{{$country_name}}
+{{$country_name.1}}
+
+{{$country_name.2}}
temp
-{{$lbl_region}}
+{{$region.1}}
-{{$region}}
+{{$region.2}}
temp
-{{$lbl_hometown}}
-{{$hometown.1}}
+
@@ -116,10 +113,10 @@
{{$lbl_marital}}
{{$marital}}
- {{$lbl_with}}
- {{$lbl_howlong}}
- {{$with.1}}
+ {{$howlong.1}}
+
@@ -132,33 +129,33 @@
-{{$lbl_homepage}}
-{{$homepage.1}}
+
-{{$lbl_politic}}
-{{$politic.1}}
+
-{{$lbl_religion}}
-{{$religion.1}}
+
-{{$lbl_pubkey}}
-
{{$lbl_pubdsc}}
+{{$pub_keywords.1}}
+{{$pub_keywords.3}}
-{{$lbl_prvkey}}
-
{{$lbl_prvdsc}}
+{{$prv_keywords.1}}
+{{$prv_keywords.3}}
@@ -169,10 +166,10 @@
-{{$lbl_about}}
+{{$about.1}}
-
+
@@ -180,10 +177,10 @@
-{{$lbl_hobbies}}
+{{$interest.1}}
-
+
@@ -191,10 +188,10 @@
-{{$lbl_likes}}
+{{$likes.1}}
-
+
@@ -202,10 +199,10 @@
-{{$lbl_dislikes}}
+{{$dislikes.1}}
-
+
@@ -213,10 +210,10 @@
@@ -230,20 +227,20 @@
-{{$lbl_music}}
+{{$music.1}}
-
+
-{{$lbl_book}}
+{{$book.1}}
-
+
@@ -252,10 +249,10 @@
-{{$lbl_tv}}
+{{$tv.1}}
-
+
@@ -264,10 +261,10 @@
-{{$lbl_film}}
+{{$film.1}}
-
+
@@ -281,10 +278,10 @@
-{{$lbl_love}}
+{{$romance.1}}
-
+
@@ -293,10 +290,10 @@
-{{$lbl_work}}
+{{$work.1}}
-
+
@@ -305,10 +302,10 @@
-{{$lbl_school}}
+{{$education.1}}
-
+
@@ -325,14 +322,14 @@
{{include file="field_yesno.tpl" field=$details}}
{{/if}}
-
{{$lbl_profname}}
-
*
+
{{$profile_name.1}}
+
*
-{{$lbl_fullname}}
-{{$name.1}}
+
@@ -344,77 +341,74 @@
-
{{$lbl_bd}}
-
-{{$dob}} {{$age}}
-
+{{$dob}}
{{/if}}
-{{$lbl_homepage}}
-{{$homepage.1}}
+
{{$hide_friends}}
-{{$lbl_address}}
-{{$address.1}}
+
-{{$lbl_city}}
-{{$locality.1}}
+
-{{$lbl_zip}}
-{{$postal_code.1}}
+
-{{$lbl_country}}
-
-{{$country_name}}
+{{$country_name.1}}
+
+{{$country_name.1}}
temp
-{{$lbl_region}}
+{{$region.1}}
-{{$region}}
+{{$region.2}}
temp
-{{$lbl_pubkey}}
-
{{$lbl_pubdsc}}
+{{$pub_keywords.1}}
+{{$pub_keywords.3}}
-{{$lbl_prvkey}}
-
{{$lbl_prvdsc}}
+{{$prv_keywords.1}}
+{{$prv_keywords.3}}
-{{$lbl_about}}
+{{$about.1}}
-
+
@@ -424,25 +418,25 @@
-
-
-
-
-
-
-
{{$visible}}
+
+
+
+
+
+
{{$visible}}
-
diff --git a/view/templates/profile_listing_header.tpl b/view/templates/profile_listing_header.tpl
index a0fa1f4996..88514c554a 100644
--- a/view/templates/profile_listing_header.tpl
+++ b/view/templates/profile_listing_header.tpl
@@ -1,9 +1,14 @@
{{$header}}
+
-{{$chg_photo}}
+ {{$chg_photo}}
+
+
+ {{$profiles}}
+
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 0ecb56441d..90288ef218 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1681,12 +1681,13 @@ ul.dropdown-menu li:hover {
/* PAGES */
/* Profile-page */
-#profile-page, .photos-content-wrapper, .settings-content-wrapper,
+.generic-page-wrapper ,#profile-page, .settings-content-wrapper,
.contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper,
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
.events-content-wrapper, .message-content-wrapper, .apps-content-wrapper,
-.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
+.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper,
+.profile_photo-content-wrapper, photos-content-wrapper {
min-height: calc(100vh - 150px);
padding: 15px;
padding-bottom: 20px;
@@ -1884,6 +1885,58 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
#poke-wrapper-end {
clear: both;
}
+
+/* Profiles Page */
+.profile-listing-table {
+ display: table;
+ width: 100%;
+}
+.profile-listing-row {
+ display: table-row;
+}
+.profile-listing-cell {
+ display: table-cell;
+}
+.profile-listing-photo {
+ width: 48px;
+ height: 48px;
+ margin: 10px 0px;
+}
+#profile-listing-new-link-wrapper {
+ margin-bottom: 20px;
+}
+.profiles-content-wrapper #profile-edit-wrapper {
+ margin-left: -15px;
+ margin-right: -15px;
+}
+.profiles-content-wrapper #profile-edit-wrapper > .panel {
+ padding-left: 15px;
+ padding-right: 15px;
+}
+.profiles-content-wrapper #profile-photo-upload-section {
+ display: none;
+ margin-left: -15px;
+ margin-right: -15px;
+ margin-top: 15px;
+ padding: 15px;
+}
+#profile-photo-upload-close {
+ font-size: 14px;
+}
+
+/* Settings */
+.section-subtitle-wrapper {
+ padding: 1px 10px;
+}
+.panel .section-subtitle-wrapper a.accordion-toggle:before {
+ font-family: FontAwesome;
+ content: "\f0d7";
+ padding-right: 5px;
+}
+.panel .section-subtitle-wrapper a.accordion-toggle.collapsed:before {
+ font-family: FontAwesome;
+ content: "\f0da";
+}
/*
* Overwriting for transparency and other colors
*/
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index 1813602713..c7b0bbfb23 100644
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -1,7 +1,7 @@
diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl
new file mode 100644
index 0000000000..e70e3cbb41
--- /dev/null
+++ b/view/theme/frio/templates/field_textarea.tpl
@@ -0,0 +1,7 @@
+
+
+
{{$field.1}}
+
+
{{$field.3}}
+
+
+ {{include file="section_title.tpl" title=$banner}}
+
+ {{* The actions dropdown which can performed to the current profile *}}
+
+
+
+
+
+
+ {{* Most of the Variables used below are arrays in the following style
+ 0 => Some kind of identifier (e.g. for the ID)
+ 1 => The label description
+ 2 => The input values
+ 3 => The additional help text (if available)
+ *}}
+
+
+
+
+
+
+
+
+
+ {{$visible}}
+
+
+
diff --git a/view/theme/frio/templates/profile_listing_header.tpl b/view/theme/frio/templates/profile_listing_header.tpl
new file mode 100644
index 0000000000..7b612f959b
--- /dev/null
+++ b/view/theme/frio/templates/profile_listing_header.tpl
@@ -0,0 +1,15 @@
+
+
diff --git a/view/theme/frost-mobile/templates/profile_edit.tpl b/view/theme/frost-mobile/templates/profile_edit.tpl
index 2855e8fb17..8d7407b09c 100644
--- a/view/theme/frost-mobile/templates/profile_edit.tpl
+++ b/view/theme/frost-mobile/templates/profile_edit.tpl
@@ -21,20 +21,20 @@
-
{{$lbl_profname}}
-
*
+
{{$profile_name.1}}
+
*
-{{$lbl_fullname}}
-{{$name.1}}
+
-{{$lbl_title}}
-{{$pdesc.1}}
+
@@ -46,10 +46,7 @@
-
{{$lbl_bd}}
-
-{{$dob}} {{$age}}
-
+{{$dob}}
@@ -62,45 +59,45 @@
-{{$lbl_address}}
-{{$address.1}}
+
-{{$lbl_city}}
-{{$locality.1}}
+
-{{$lbl_zip}}
-{{$postal_code.1}}
+
-{{$lbl_country}}
-
-{{$country_name}}
+{{$country_name.1}}
+
+{{$country_name.2}}
temp
-{{$lbl_region}}
+{{$region.1}}
-{{$region}}
+{{$region.2}}
temp
-{{$lbl_hometown}}
-{{$hometown.1}}
+
@@ -113,10 +110,10 @@
{{$lbl_marital}}
{{$marital}}
- {{$lbl_with}}
- {{$lbl_howlong}}
- {{$with.1}}
+ {{$howlong.1}}
+
@@ -129,33 +126,33 @@
-{{$lbl_homepage}}
-{{$homepage.1}}
+
-{{$lbl_politic}}
-{{$politic.1}}
+
-{{$lbl_religion}}
-{{$religion.1}}
+
-{{$lbl_pubkey}}
-
{{$lbl_pubdsc}}
+{{$pub_keywords.1}}
+{{$pub_keywords.3}}
-{{$lbl_prvkey}}
-
{{$lbl_prvdsc}}
+{{$prv_keywords.1}}
+{{$prv_keywords.3}}
@@ -166,10 +163,10 @@
-{{$lbl_about}}
+{{$about.1}}
-
+
@@ -177,10 +174,10 @@
-{{$lbl_hobbies}}
+{{$interest.1}}
-
+
@@ -188,10 +185,10 @@
-{{$lbl_likes}}
+{{$likes.1}}
-
+
@@ -199,10 +196,10 @@
-{{$lbl_dislikes}}
+{{$dislikes.1}}
-
+
@@ -210,10 +207,10 @@
@@ -227,20 +224,20 @@
-{{$lbl_music}}
+{{$music.1}}
-
+
-{{$lbl_book}}
+{{$book.1}}
-
+
@@ -249,10 +246,10 @@
-{{$lbl_tv}}
+{{$tv.1}}
-
+
@@ -261,10 +258,10 @@
-{{$lbl_film}}
+{{$film.1}}
-
+
@@ -278,10 +275,10 @@
-{{$lbl_love}}
+{{$romance.1}}
-
+
@@ -290,10 +287,10 @@
-{{$lbl_work}}
+{{$work.1}}
-
+
@@ -302,10 +299,10 @@
-{{$lbl_school}}
+{{$education.1}}
-
+
diff --git a/view/theme/frost/templates/profile_edit.tpl b/view/theme/frost/templates/profile_edit.tpl
index a7c57c99a2..40a3c86a28 100644
--- a/view/theme/frost/templates/profile_edit.tpl
+++ b/view/theme/frost/templates/profile_edit.tpl
@@ -21,20 +21,20 @@
-
{{$lbl_profname}}
-
*
+
{{$profile_name.1}}
+
*
-{{$lbl_fullname}}
-{{$name.1}}
+
-{{$lbl_title}}
-{{$pdesc.1}}
+
@@ -46,10 +46,7 @@
-
{{$lbl_bd}}
-
-{{$dob}} {{$age}}
-
+{{$dob}}
@@ -62,45 +59,45 @@
-{{$lbl_address}}
-{{$address.1}}
+
-{{$lbl_city}}
-{{$locality.1}}
+
-{{$lbl_zip}}
-{{$postal_code.1}}
+
-{{$lbl_country}}
-
-{{$country_name}}
+{{$country_name.1}}
+
+{{$country_name.2}}
temp
-{{$lbl_region}}
+{{$region.1}}
-{{$region}}
+{{$region.2}}
temp
-{{$lbl_hometown}}
-{{$hometown.1}}
+
@@ -113,10 +110,10 @@
{{$lbl_marital}}
{{$marital}}
- {{$lbl_with}}
- {{$lbl_howlong}}
- {{$with.1}}
+ {{$howlong.1}}
+
@@ -129,33 +126,33 @@
-{{$lbl_homepage}}
-{{$homepage.1}}
+
-{{$lbl_politic}}
-{{$politic.1}}
+
-{{$lbl_religion}}
-{{$religion.1}}
+
-{{$lbl_pubkey}}
-
{{$lbl_pubdsc}}
+{{$pub_keywords.1}}
+{{$pub_keywords.3}}
-{{$lbl_prvkey}}
-
{{$lbl_prvdsc}}
+{{$prv_keywords.1}}
+{{$prv_keywords.3}}
@@ -166,10 +163,10 @@
-{{$lbl_about}}
+{{$about.1}}
-
+
@@ -177,10 +174,10 @@
-{{$lbl_hobbies}}
+{{$interest.1}}
-
+
@@ -188,10 +185,10 @@
-{{$lbl_likes}}
+{{$likes.1}}
-
+
@@ -199,10 +196,10 @@
-{{$lbl_dislikes}}
+{{$dislikes.1}}
-
+
@@ -210,10 +207,10 @@
@@ -227,20 +224,20 @@
-{{$lbl_music}}
+{{$music.1}}
-
+
-{{$lbl_book}}
+{{$book.1}}
-
+
@@ -249,10 +246,10 @@
-{{$lbl_tv}}
+{{$tv.1}}
-
+
@@ -261,10 +258,10 @@
-{{$lbl_film}}
+{{$film.1}}
-
+
@@ -278,10 +275,10 @@
-{{$lbl_love}}
+{{$romance.1}}
-
+
@@ -290,10 +287,10 @@
-{{$lbl_work}}
+{{$work.1}}
-
+
@@ -302,10 +299,10 @@
-{{$lbl_school}}
+{{$education.1}}
-
+
diff --git a/view/theme/vier/templates/profile_edit.tpl b/view/theme/vier/templates/profile_edit.tpl
index 9270410561..fa2cd18576 100644
--- a/view/theme/vier/templates/profile_edit.tpl
+++ b/view/theme/vier/templates/profile_edit.tpl
@@ -29,7 +29,7 @@
-
+
-