aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-03 17:29:23 -0700
committerfriendica <info@friendica.com>2014-08-03 17:29:23 -0700
commite0d338f102d72a4ea34c08ce2c7b3ab5244f3e4e (patch)
tree07357323c5ad0ec6a63693d58dbc60d3c7e91e40
parent464b2b65702e7a84df6632240377d1920233d495 (diff)
downloadvolse-hubzilla-e0d338f102d72a4ea34c08ce2c7b3ab5244f3e4e.tar.gz
volse-hubzilla-e0d338f102d72a4ea34c08ce2c7b3ab5244f3e4e.tar.bz2
volse-hubzilla-e0d338f102d72a4ea34c08ce2c7b3ab5244f3e4e.zip
always provide 'name' on profile edit page (and profile name), regardless of any other allowed fields.
-rw-r--r--assets/home.html4
-rwxr-xr-xview/tpl/profile_edit.tpl3
2 files changed, 3 insertions, 4 deletions
diff --git a/assets/home.html b/assets/home.html
index 5b4278001..329a27901 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -239,7 +239,7 @@ function update_element() {
<div lang="en" class="wrapper">
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-One of the traditional problems with independent publishing on the internet has always been the fact that independent publishers often operate as isolated islands within their own website, and spend most of their resources attracting visitors. The rise of corporate providers and social networking services alleviated many of these problems; however centralisation has led to a situation where your content where is no longer under your direct control. It is shared fully with corporate advertisers and governments, but ironically you are now often asked to pay money to ensure that your friends can see it. What if you could have advantages of scale and connections that centralisation offers whilst maintaining independent control over your own web presence?
+One of the traditional problems with independent publishing on the internet has always been the fact that independent publishers often operate as isolated islands within their own website, and spend most of their resources attracting visitors. The rise of corporate providers and social networking services alleviated many of these problems; however centralisation has led to a situation where your content where is no longer under your direct control. It is shared fully with corporate advertisers and governments, but ironically you are now often asked to pay money to ensure that your friends can see it. What if you could have advantages of scale and connections that centralisation typically offers whilst maintaining independent control over your own web presence?
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
@@ -251,7 +251,7 @@ What makes the RedMatrix unique is what we call "magic authentication" - which i
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix is ideal for social communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.<br />
+The RedMatrix is ideal for communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.<br />
</div>
<br />
<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - &quot;The Network&quot;</strong></div>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 838415f80..1a99a07be 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -27,13 +27,12 @@
</div>
<div id="profile-edit-profile-name-end"></div>
-{{if $fields.name}}
<div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
</div>
<div id="profile-edit-name-end"></div>
-{{/if}}
+
{{if $fields.pdesc}}
<div id="profile-edit-pdesc-wrapper" >