diff options
| -rw-r--r-- | mod/pdledit.php | 3 | ||||
| -rw-r--r-- | mod/register.php | 1 | ||||
| -rw-r--r-- | view/js/main.js | 6 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 1 |
5 files changed, 10 insertions, 5 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/js/main.js b/view/js/main.js index 1fb61ebab..ca2f3bbcb 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -650,7 +650,7 @@ function collapseHeight() { //var trigger = $(window).scrollTop() < $(this).offset().top ? true : false; // check if we will collapse some content above the visible content and compensate the diff later - if($(window).scrollTop() > $(this).offset().top) { + if(($(this).offset().top + orgHeight - $(window).scrollTop()) < 50) { diff = orgHeight - divmore_height; cDiff = cDiff + diff; i++; @@ -683,7 +683,7 @@ function collapseHeight() { if(i){ var sval = position - cDiff + ($(".divgrow-showmore").outerHeight() * i); - console.log('collapsed above vieport count: ' + i); + console.log('collapsed above viewport count: ' + i); $(window).scrollTop(sval); } @@ -753,7 +753,7 @@ function liveUpdate() { $("#page-spinner").spin(false); $("#profile-jot-text-loading").spin(false); - $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff); + //$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff); in_progress = false; 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> |