diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-16 18:15:40 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-16 18:15:40 -0800 |
| commit | 0a1021537129bdef5bf16d5a5fdbcae92a84f494 (patch) | |
| tree | 5aa5053d982333958e8caf4be8f3da7f24c0151e /mod | |
| parent | 28a593e1ce9e715195ffc4e6bdd86fe1ad6b85e0 (diff) | |
| parent | f738902107b118e8edb444e4bec2f98b7c5ea97a (diff) | |
| download | volse-hubzilla-0a1021537129bdef5bf16d5a5fdbcae92a84f494.tar.gz volse-hubzilla-0a1021537129bdef5bf16d5a5fdbcae92a84f494.tar.bz2 volse-hubzilla-0a1021537129bdef5bf16d5a5fdbcae92a84f494.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/pdledit.php | 3 | ||||
| -rw-r--r-- | mod/register.php | 1 |
2 files changed, 4 insertions, 0 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'), |