aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-02-16 21:46:24 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-02-16 21:46:24 +0100
commitf738902107b118e8edb444e4bec2f98b7c5ea97a (patch)
tree0e05067fd2317f60c2f26cc9dff2119855ef8c4d
parent364972a2925ee9545364e53b79d5a3d50149119d (diff)
downloadvolse-hubzilla-f738902107b118e8edb444e4bec2f98b7c5ea97a.tar.gz
volse-hubzilla-f738902107b118e8edb444e4bec2f98b7c5ea97a.tar.bz2
volse-hubzilla-f738902107b118e8edb444e4bec2f98b7c5ea97a.zip
@hubdomain also for auto-create-channel + adding css wrapper (ongoing work)
-rw-r--r--mod/pdledit.php3
-rw-r--r--mod/register.php1
-rw-r--r--view/tpl/pdledit.tpl4
-rwxr-xr-xview/tpl/register.tpl1
4 files changed, 7 insertions, 2 deletions
diff --git a/mod/pdledit.php b/mod/pdledit.php
index f2a25566a..bf29b2da0 100644
--- a/mod/pdledit.php
+++ b/mod/pdledit.php
@@ -26,6 +26,7 @@ function pdledit_content(&$a) {
if(argc() > 1)
$module = 'mod_' . argv(1) . '.pdl';
else {
+ $o .= '<div class="generic-content-wrapper-styled">';
$o .= '<h1>' . t('Edit System Page Description') . '</h1>';
$files = glob('mod/*');
if($files) {
@@ -38,6 +39,8 @@ function pdledit_content(&$a) {
}
}
+ $o .= '</div>';
+
// list module pdl files
return $o;
}
diff --git a/mod/register.php b/mod/register.php
index 49b010cc7..411d34d64 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -246,6 +246,7 @@ function register_content(&$a) {
'$label_name' => t('Channel Name'),
'$help_name' => t('Enter your name'),
'$label_nick' => t('Choose a short nickname'),
+ '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')),
'$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
'$name' => $name,
'$help_role' => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'),
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
index 9df93e4c6..af8e37602 100644
--- a/view/tpl/pdledit.tpl
+++ b/view/tpl/pdledit.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$header}}</h1>
<h2>{{$mname}} {{$module}}</h2>
@@ -17,5 +18,4 @@
<input type="submit" name="submit" value="{{$submit}}" />
</form>
-
-
+</div>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index b72e069c3..857b5e984 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -66,6 +66,7 @@
<label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label>
<input type="text" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" />
<div id="nick-spinner"></div>
+ <div id="newchannel-nick-desc" class="descriptive-paragraph" style="text-align: right;">{{$nick_hub}}</div>
<div id="newchannel-nickname-feedback" class="register-feedback"></div>
<div id="newchannel-nickname-end" class="register-field-end"></div>