harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2016-02-16 18:15:40 -08:00
commit 0a10215371
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/pdledit.php
View File

@ -26,6 +26,7 @@ function pdledit_content(&$a) {
if(argc() > 1) if(argc() > 1)
$module = 'mod_' . argv(1) . '.pdl'; $module = 'mod_' . argv(1) . '.pdl';
else { else {
$o .= '<div class="generic-content-wrapper-styled">';
$o .= '<h1>' . t('Edit System Page Description') . '</h1>'; $o .= '<h1>' . t('Edit System Page Description') . '</h1>';
$files = glob('mod/*'); $files = glob('mod/*');
if($files) { if($files) {
@ -38,6 +39,8 @@ function pdledit_content(&$a) {
} }
} }
$o .= '</div>';
// list module pdl files // list module pdl files
return $o; return $o;
} }

1
mod/register.php
View File

@ -246,6 +246,7 @@ function register_content(&$a) {
'$label_name' => t('Channel Name'), '$label_name' => t('Channel Name'),
'$help_name' => t('Enter your name'), '$help_name' => t('Enter your name'),
'$label_nick' => t('Choose a short nickname'), '$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.'), '$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, '$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'), '$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'),

6
view/js/main.js
View File

@ -650,7 +650,7 @@ function collapseHeight() {
//var trigger = $(window).scrollTop() < $(this).offset().top ? true : false; //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 // 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; diff = orgHeight - divmore_height;
cDiff = cDiff + diff; cDiff = cDiff + diff;
i++; i++;
@ -683,7 +683,7 @@ function collapseHeight() {
if(i){ if(i){
var sval = position - cDiff + ($(".divgrow-showmore").outerHeight() * 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); $(window).scrollTop(sval);
} }
@ -753,7 +753,7 @@ function liveUpdate() {
$("#page-spinner").spin(false); $("#page-spinner").spin(false);
$("#profile-jot-text-loading").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; in_progress = false;

4
view/tpl/pdledit.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper-styled">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
<h2>{{$mname}} {{$module}}</h2> <h2>{{$mname}} {{$module}}</h2>
@ -17,5 +18,4 @@
<input type="submit" name="submit" value="{{$submit}}" /> <input type="submit" name="submit" value="{{$submit}}" />
</form> </form>
</div>

1
view/tpl/register.tpl
View File

@ -66,6 +66,7 @@
<label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label> <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}}" /> <input type="text" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" />
<div id="nick-spinner"></div> <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-feedback" class="register-feedback"></div>
<div id="newchannel-nickname-end" class="register-field-end"></div> <div id="newchannel-nickname-end" class="register-field-end"></div>