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-18 15:26:50 -08:00
commit 4512a4cdd4
8 changed files with 2835 additions and 2733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/widgets.php
View File

@ -542,11 +542,14 @@ function widget_settings_menu($arr) {
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
);
$tabs[] = array(
'label' => t('Export channel'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
);
// IF can go away when UNO export and import is fully functional
if(! UNO) {
$tabs[] = array(
'label' => t('Export channel'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
);
}
if($role === false || $role === 'custom') {
$tabs[] = array(

5
view/css/mod_register.css
View File

@ -79,3 +79,8 @@ h2 {
clear: both;
margin-bottom: 20px;
}
.descriptive-paragraph {
margin-left: 20px;
margin-bottom: 25px;
}

4654
view/it/hmessages.po
View File

File diff suppressed because it is too large Load Diff

868
view/it/hstrings.php
View File

File diff suppressed because it is too large Load Diff

8
view/tpl/register.tpl
View File

@ -31,14 +31,12 @@
{{include file="field_select_grouped.tpl" field=$role}}
<div id="newchannel-role-end" class="newchannel-field-end"></div>
{{/if}}
<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
<label for="newchannel-name" id="label-newchannel-name" class="register-label" >{{$label_name}}</label>
<input type="text" name="name" id="newchannel-name" class="register-input" value="{{$name}}" />
<div id="name-spinner"></div>
<div id="newchannel-name-feedback" class="register-feedback"></div>
<div id="newchannel-name-end" class="register-field-end"></div>
<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
{{/if}}
@ -62,13 +60,13 @@
<div id="register-password2-end" class="register-field-end"></div>
{{if $auto_create}}
<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
<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-nick-desc" 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>
<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
{{/if}}

2
view/tpl/settings.tpl
View File

@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>{{/if}}
<h2>{{$ptitle}}</h2>
<div class="clear"></div>
</div>

9
view/tpl/settings_oauth.tpl
View File

@ -1,7 +1,9 @@
<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<div class="section-content-tools-wrapper">
<form action="settings/oauth" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@ -31,3 +33,4 @@
</form>
</div>
</div>

9
view/tpl/settings_oauth_edit.tpl
View File

@ -1,5 +1,8 @@
<h1>{{$title}}</h1>
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<div class="section-content-tools-wrapper">
<form method="POST">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@ -15,3 +18,5 @@
</div>
</form>
</div>
</div>