diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh index 01acb1ec9..b981666c5 100755 --- a/.homeinstall/hubzilla-setup.sh +++ b/.homeinstall/hubzilla-setup.sh @@ -606,7 +606,7 @@ function install_hubzilla_plugins { echo "# 2. run" >> $plugin_install echo "# cd /var/www/html/.homeinstall" >> $plugin_install echo "# ./hubzilla-setup.sh" >> $plugin_install - echo "https://gitlab.com/zot/ownmapp.git ownMap" >> $plugin_install + echo "https://gitlab.com/zot/ownmapp.git ownMapp" >> $plugin_install echo "https://gitlab.com/zot/hubzilla-chess.git chess" >> $plugin_install fi # install plugins diff --git a/mod/profiles.php b/mod/profiles.php index c135814a8..c3f5679fe 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -686,7 +686,7 @@ function profiles_content(&$a) { '$banner' => t('Edit Profile Details'), '$submit' => t('Submit'), '$viewprof' => t('View this profile'), - '$editvis' => t('Edit visibility'), + '$editvis' => t('Edit visibility'), '$coverpic' => t('Change Cover Photo'), '$profpic' => t('Change Profile Photo'), '$cr_prof' => t('Create a new profile using these settings'), @@ -698,26 +698,6 @@ function profiles_content(&$a) { '$lbl_gender' => t('Your Gender'), '$lbl_marital' => t('Marital Status'), '$lbl_sexual' => t('Sexual Preference'), - '$lbl_homepage' => t('Homepage URL'), - '$lbl_politic' => t('Political Views'), - '$lbl_religion' => t('Religious Views'), - '$lbl_pubkey' => t('Keywords'), - '$lbl_likes' => t('Likes'), - '$lbl_dislikes' => t('Dislikes'), - '$lbl_ex2' => t('Example: fishing photography software'), - '$lbl_pubdsc' => t("Used in directory listings"), - '$lbl_about' => t('Tell us about yourself...'), - '$lbl_hobbies' => t('Hobbies/Interests'), - '$lbl_social' => t('Contact information and Social Networks'), - '$lbl_channels' => t('My other channels'), - '$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' => array('profile_name', t('Profile Name'), $r[0]['profile_name'], '', '*'), @@ -732,7 +712,7 @@ function profiles_content(&$a) { '$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', t('Country'), $r[0]['country_name']), + '$country_name' => array('country_name', t('Country'), $r[0]['country_name']), '$gender' => gender_selector($r[0]['gender']), '$gender_min' => gender_selector_min($r[0]['gender']), '$marital' => marital_selector($r[0]['marital']), @@ -741,24 +721,24 @@ function profiles_content(&$a) { '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))), '$sexual' => sexpref_selector($r[0]['sexual']), '$sexual_min' => sexpref_selector_min($r[0]['sexual']), - '$about' => $r[0]['about'], - '$homepage' => $r[0]['homepage'], + '$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' => $r[0]['politic'], - '$religion' => $r[0]['religion'], - '$keywords' => $r[0]['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'], - '$channels' => $r[0]['channels'], + '$politic' => array('politic', t('Political Views'), $r[0]['politic']), + '$religion' => array('religion', t('Religious Views'), $r[0]['religion']), + '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')), + '$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']), + '$channels' => array('channels', t('My other channels'), $r[0]['channels']), '$extra_fields' => $extra_fields, )); diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css new file mode 100644 index 000000000..eec67be15 --- /dev/null +++ b/view/css/mod_profiles.css @@ -0,0 +1,8 @@ +#profile-upload-form { + display: none; +} + +#profile-upload-choose { + padding: 7px 10px; + width: 100%; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f365bec1a..5aee57cad 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -260,34 +260,6 @@ footer { clear: both; } -#profile-edit-links { - padding-top: 15px; - padding-bottom: 15px; -} - -#profile-edit-links .btn { - margin: 0 10px 15px 0; -} - -.profile-import { - vertical-align: top; - text-align: left; -} - -.profile-import b { - color: $link_colour; -} - -.profile-import input { - color: $font_colour; - border: none; -} - -#profile-edit-drop-link { - color: #FFF; - font-weight: normal; -} - .fn { font-weight: bold; font-size: 16px; diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 1929820cb..daa56e15c 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,330 +1,235 @@
+
+ +

{{$banner}}

+
+
+
+ + +
+
+
+ {{if $is_default}} +
{{$default}}
+ {{/if}} +
+ -

{{$banner}}

+ {{include file="field_input.tpl" field=$profile_name}} -
- + {{include file="field_input.tpl" field=$name}} - - - - - -{{if $is_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}} -
- -{{if $advanced}} -{{$gender}} -{{else}} -{{$gender_min}} -{{/if}} -
-
-{{/if}} - -{{if $fields.dob}} -{{$dob}} -{{/if}} - -{{include file="field_checkbox.tpl" field=$hide_friends}} - -
- -
-
- -{{if $fields.address}} -{{include file="field_input.tpl" field=$address}} -{{/if}} - -{{if $fields.locality}} -{{include file="field_input.tpl" field=$locality}} -{{/if}} - -{{if $fields.postal_code}} -{{include file="field_input.tpl" field=$postal_code}} -{{/if}} - -{{if $fields.region}} -{{include file="field_input.tpl" field=$region}} -{{/if}} - -{{if $fields.country_name}} -{{include file="field_input.tpl" field=$country_name}} -{{/if}} - -{{if $fields.hometown}} -{{include file="field_input.tpl" field=$hometown}} -{{/if}} - -
- -
-
- -{{if $fields.marital }} -
- -{{if $advanced}} -{{$marital}} -{{else}} -{{$marital_min}} -{{/if}} -
-
- -{{if $fields.with}} -{{include file="field_input.tpl" field=$with}} -{{/if}} - -{{if $fields.howlong}} -{{include file="field_input.tpl" field=$howlong}} -{{/if}} - -
-{{/if}} - -{{if $fields.homepage}} -
- - -
-
-{{/if}} - -{{if $fields.sexual}} -
- -{{$sexual}} -
-
-{{/if}} - -{{if $fields.politic}} -
- - -
-
-{{/if}} - -{{if $fields.religion}} -
- - -
-
-{{/if}} - -{{if $fields.keywords}} -
- - -
-{{$lbl_pubdsc}} -
-{{/if}} - -

- -{{if $fields.about}} -
-

-{{$lbl_about}} -

- - - -
-
-{{/if}} - -{{if $fields.contact}} -
-

-{{$lbl_social}} -

- - - -
-
-{{/if}} - - -{{if $fields.interest}} -
-

-{{$lbl_hobbies}} -

- - - -
-
-{{/if}} - -{{if $fields.likes}} -
-

-{{$lbl_likes}} -

- - - -
-
-{{/if}} - -{{if $fields.dislikes}} -
-

-{{$lbl_dislikes}} -

- - - -
-
-{{/if}} - -{{if $fields.channels}} -
-

-{{$lbl_channels}} -

- - - -
-
-{{/if}} - -{{if $fields.music}} -
-

-{{$lbl_music}} -

- - - -
-
-{{/if}} - -{{if $fields.book}} -
-

-{{$lbl_book}} -

- - - -
-
-{{/if}} - -{{if $fields.tv}} -
-

-{{$lbl_tv}} -

- - - -
-
-{{/if}} - -{{if $fields.film}} -
-

-{{$lbl_film}} -

- - - -
-
-{{/if}} - - -{{if $fields.romance}} -
-

-{{$lbl_love}} -

- - - -
-
-{{/if}} - -{{if $fields.work}} -
-

-{{$lbl_work}} -

- - - -
-
-{{/if}} - -{{if $fields.education}} -
-

-{{$lbl_school}} -

- - - -
-
-{{/if}} - -{{if $extra_fields}} -{{foreach $extra_fields as $field }} -{{include file="field_input.tpl" field=$field}} -{{/foreach}} -{{/if}} - -
- -
-
- - - -
-
+ {{if $fields.pdesc}} + {{include file="field_input.tpl" field=$pdesc}} + {{/if}} + + {{if $fields.gender}} +
+ + {{if $advanced}} + {{$gender}} + {{else}} + {{$gender_min}} + {{/if}} +
+
+ {{/if}} + + {{if $fields.dob}} + {{$dob}} + {{/if}} + + {{include file="field_checkbox.tpl" field=$hide_friends}} + +
+ +
+
+ + {{if $fields.address}} + {{include file="field_input.tpl" field=$address}} + {{/if}} + + {{if $fields.locality}} + {{include file="field_input.tpl" field=$locality}} + {{/if}} + + {{if $fields.postal_code}} + {{include file="field_input.tpl" field=$postal_code}} + {{/if}} + + {{if $fields.region}} + {{include file="field_input.tpl" field=$region}} + {{/if}} + + {{if $fields.country_name}} + {{include file="field_input.tpl" field=$country_name}} + {{/if}} + + {{if $fields.hometown}} + {{include file="field_input.tpl" field=$hometown}} + {{/if}} + +
+ +
+
+ + {{if $fields.marital }} +
+ + {{if $advanced}} + {{$marital}} + {{else}} + {{$marital_min}} + {{/if}} +
+
+ + {{if $fields.with}} + {{include file="field_input.tpl" field=$with}} + {{/if}} + + {{if $fields.howlong}} + {{include file="field_input.tpl" field=$howlong}} + {{/if}} +
+ {{/if}} + + {{if $fields.homepage}} + {{include file="field_input.tpl" field=$homepage}} + {{/if}} + + {{if $fields.sexual}} +
+ + {{$sexual}} +
+
+ {{/if}} + + {{if $fields.politic}} + {{include file="field_input.tpl" field=$politic}} + {{/if}} + + {{if $fields.religion}} + {{include file="field_input.tpl" field=$religion}} + {{/if}} + + {{if $fields.keywords}} + {{include file="field_input.tpl" field=$keywords}} + {{/if}} + + {{if $fields.about}} + {{include file="field_textarea.tpl" field=$about}} + {{/if}} + + {{if $fields.contact}} + {{include file="field_textarea.tpl" field=$contact}} + {{/if}} + + + {{if $fields.interest}} + {{include file="field_textarea.tpl" field=$interest}} + {{/if}} + + {{if $fields.likes}} + {{include file="field_textarea.tpl" field=$likes}} + {{/if}} + + {{if $fields.dislikes}} + {{include file="field_textarea.tpl" field=$dislikes}} + {{/if}} + + {{if $fields.channels}} + {{include file="field_textarea.tpl" field=$channels}} + {{/if}} + + {{if $fields.music}} + {{include file="field_textarea.tpl" field=$music}} + {{/if}} + + {{if $fields.book}} + {{include file="field_textarea.tpl" field=$book}} + {{/if}} + + {{if $fields.tv}} + {{include file="field_textarea.tpl" field=$tv}} + {{/if}} + + {{if $fields.film}} + {{include file="field_textarea.tpl" field=$film}} + {{/if}} + + + {{if $fields.romance}} + {{include file="field_textarea.tpl" field=$romance}} + {{/if}} + + {{if $fields.work}} + {{include file="field_textarea.tpl" field=$work}} + {{/if}} + + {{if $fields.education}} + {{include file="field_textarea.tpl" field=$education}} + {{/if}} + + {{if $extra_fields}} + {{foreach $extra_fields as $field }} + {{include file="field_input.tpl" field=$field}} + {{/foreach}} + {{/if}} + +
+ +
+
+
+ +