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

Merge branch '3.8RC'

Browse Source
This commit is contained in:
Mario Vavti
2018-10-19 11:18:28 +02:00
parent 32de123db0 06b3ad1071
commit fa9e9510e5
862 changed files with 98136 additions and 29195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
view/css/conversation.css
View File

@@ -31,10 +31,11 @@
position: relative;
}
#profile-jot-reset {
#profile-jot-tools {
position: absolute;
top: 0px;
right: 0px;
opacity: 0.7;
}
#profile-jot-text {

7
view/css/mod_apps.css
View File

@@ -1,9 +1,12 @@
.app-container {
float: left;
width: 148px;
margin: 20px;
width: 177px;
margin: 35px;
}
.app-name {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin: 10px 0px;
}

17
view/css/mod_settings.css
View File

@@ -9,20 +9,3 @@
.channel-menu {
margin-top: 24px;
}
.zat-example {
color: red;
}
#atoken-index {
width: 100%;
}
#atoken-index td:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
.atoken-index-tool {
padding: 7px 10px;
}

16
view/css/mod_tokens.css Normal file
View File

@@ -0,0 +1,16 @@
.zat-example {
color: red;
}
#atoken-index {
width: 100%;
}
#atoken-index td:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
.atoken-index-tool {
padding: 7px 10px;
}

1
view/css/widgets.css
View File

@@ -142,7 +142,6 @@ li:hover .group-edit-icon {
position: relative;
width: 100%;
height: auto;
cursor: pointer;
}
#cover-photo-caption {

7086
view/es-es/hmessages.po
View File

File diff suppressed because it is too large Load Diff

779
view/es-es/hstrings.php
View File

File diff suppressed because it is too large Load Diff

70
view/js/main.js
View File

@@ -41,26 +41,31 @@ $.ajaxSetup({cache: false});
$(document).ready(function() {
$(document).on('click focus', '.comment-edit-form', handle_comment_form);
$(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'],
suffixAgo : aStr['t03'],
suffixFromNow : aStr['t04'],
seconds : aStr['t05'],
minute : aStr['t06'],
minutes : function(value){return tf(value, aStr['t07']);},
hour : aStr['t08'],
hours : function(value){return tf(value, aStr['t09']);},
day : aStr['t10'],
days : function(value){return tf(value, aStr['t11']);},
month : aStr['t12'],
months : function(value){return tf(value, aStr['t13']);},
year : aStr['t14'],
years : function(value){return tf(value, aStr['t15']);},
wordSeparator : aStr['t16'],
numbers : aStr['t17'],
};
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'],
suffixAgo : aStr['t03'],
suffixFromNow : aStr['t04'],
seconds : aStr['t05'],
minute : aStr['t06'],
minutes : aStr['t07'],
hour : aStr['t08'],
hours : aStr['t09'],
day : aStr['t10'],
days : aStr['t11'],
month : aStr['t12'],
months : aStr['t13'],
year : aStr['t14'],
years : aStr['t15'],
wordSeparator : aStr['t16'],
numbers : aStr['t17'],
};
//mod_mail only
$(".mail-conv-detail .autotime").timeago();
@@ -122,6 +127,33 @@ $(document).ready(function() {
});
function getConversationSettings() {
$.get('settings/conversation/?f=&aj=1',function(data) {
$('#conversation_settings_body').html(data);
});
}
function postConversationSettings() {
$.post(
'settings/conversation',
$('#settings_module_ajax_form').serialize() + "&auto_update=" + next_page
);
if(next_page === 1) {
page_load = true;
}
$('#conversation_settings').modal('hide');
if(timer) clearTimeout(timer);
timer = setTimeout(updateInit,100);
return false;
}
function datasrc2src(selector) {
$(selector).each(function(i, el) {
$(el).attr("src", $(el).data("src"));

3
view/js/mod_photos.js
View File

@@ -11,7 +11,8 @@ $(document).ready(function() {
$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
$("#photo-edit-newtag").val('@' + data.name);
});
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
$('textarea').bbco_autocomplete('bbcode');
showHideBodyTextarea();

1
view/pdl/mod_articles.pdl
View File

@@ -1,4 +1,5 @@
[region=aside]
[widget=archive][var=articles]1[/var][/widget]
[widget=categories][var=articles]1[/var][/widget]
[widget=tasklist][/widget]
[widget=notes][/widget]

1
view/pdl/mod_uexport.pdl
View File

@@ -1,5 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]
[region=right_aside]
[widget=notifications][/widget]

1
view/pdl/mod_wiki.pdl
View File

@@ -1,5 +1,6 @@
[region=aside]
[widget=vcard][/widget]
[widget=wiki_list][/widget]
[widget=wiki_pages][/widget]
[/region]
[region=right_aside]

4
view/php/default.php
View File

@@ -10,12 +10,12 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main>
<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
<aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
<div id="pause"></div>
</section>
<aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
<aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
</main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>

28031
view/ru/hmessages.po
View File

File diff suppressed because it is too large Load Diff

6231
view/ru/hstrings.php
View File

File diff suppressed because it is too large Load Diff

2
view/ru/lostpass_eml.tpl
View File

@@ -1,5 +1,5 @@
Уважаемый {{$username}},
Недавно {{$sitename}} был получен запрос на сброс пароля вашей
учётной записи. Для подтверждения этого запроса, пожалуйста перейдите по ссылке
проверки ниже или вставьте его в адресную строку вашего браузера.

2
view/ru/passchanged_eml.tpl
View File

@@ -1,5 +1,5 @@
Дорогой {{$username}},
Ваш пароль был изменен, как вы и просили. Пожалуйста, сохраните эту
информацию в ваших записях (или смените свой пароль на такой
который вы точно не забудете).

34
view/ru/register_verify_member.tpl Normal file
View File

@@ -0,0 +1,34 @@
Благодарим вас за регистрацию на {{$sitename}}.
Детали учётной записи:
Адрес сайта: {{$siteurl}}
Имя для входа: {{$email}}
Войдите с паролем, который вы указали при регистрации.
Для предоставления полного доступа необходимо проверить ваш адрес электронной почты.
Ваш код подтверждения
{{$hash}}
Если вы регистрировали эту учётную запись, пожалуйста введите код подтверждения перейдя по ссылке:
{{$siteurl}}/regver/allow/{{$hash}}
Для отказа и удаления учётной записи перейдите по ссылке:
{{$siteurl}}/regver/deny/{{$hash}}
Спасибо.
--
Условия предоставления услуг:
{{$siteurl}}/help/TermsOfService

13
view/theme/redbasic/css/style.css
View File

@@ -32,7 +32,8 @@ aside #region_1 {
border-right: 1px solid transparent;
}
aside #left_aside_wrapper {
aside #left_aside_wrapper,
aside #right_aside_wrapper {
margin-bottom: 10px;
}
@@ -1513,11 +1514,15 @@ blockquote {
left: 0px;
}
#nav-app-link-wrapper {
#nav-app-link-wrapper.has_location {
min-width: 0;
flex-basis: 25%;
}
#nav-app-link-wrapper {
margin-right: 0.5rem;
}
#navbar-collapse-2 .navbar-app i {
font-size: 1rem;
margin-right: 0.5rem;
@@ -1672,11 +1677,9 @@ dl.bb-dl > dd > li {
.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
background-color: red;
border-radius: 3px;
background-color: red;
opacity: 0.3;
filter:alpha(opacity=30);
}

19
view/theme/redbasic/js/redbasic.js
View File

@@ -18,26 +18,13 @@ $(document).ready(function() {
$('#css3-calc').remove(); // Remove the test element
if($(window).width() >= 992) {
$('#left_aside_wrapper').stick_in_parent({
$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '#left_aside_spacer'
spacer: '.aside_spacer'
});
}
if($(window).width() >= 992) {
$('#right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '#right_aside_spacer'
});
}
$('#notifications_wrapper.fs #notifications').stick_in_parent({
parent: '#notifications_wrapper'
});
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
@@ -56,7 +43,7 @@ $(document).ready(function() {
});
var right_aside_height = $('#rightt_aside_wrapper').height();
var right_aside_height = $('#right_aside_wrapper').height();
$('#right_aside_wrapper').on('click', function() {
if(right_aside_height != $('#right_aside_wrapper').height()) {

6
view/theme/redbasic/php/config.php
View File

@@ -54,6 +54,7 @@ class RedbasicConfig {
$arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width");
$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
$arr['advanced_theming'] = get_pconfig(local_channel(), 'redbasic', 'advanced_theming');
return $this->form($arr);
}
@@ -80,15 +81,15 @@ class RedbasicConfig {
set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
set_pconfig(local_channel(), 'redbasic', 'advanced_theming', $_POST['redbasic_advanced_theming']);
}
}
function form($arr) {
if(feature_enabled(local_channel(),'advanced_theming'))
if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming'))
$expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'),
'$baseurl' => z_root(),
@@ -112,6 +113,7 @@ class RedbasicConfig {
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
));
return $o;

4
view/theme/redbasic/php/theme_init.php
View File

@@ -1,14 +1,14 @@
<?php
head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
head_add_css('/library/bootstrap/css/bootstrap.min.css');
head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('/view/css/bootstrap-red.css');
head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
head_add_js('/library/bootbox/bootbox.min.js');
head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('/library/datetimepicker/jquery.datetimepicker.js');

1
view/theme/redbasic/schema/Focus-Light.css
View File

@@ -1,3 +1,4 @@
.dropdown-header.text-white-50,
.navbar-dark .navbar-toggler,
.navbar-dark .nav-link.active {
color: rgba(0,0,0,0.7) !important;

3
view/theme/redbasic/schema/dark.css
View File

@@ -152,6 +152,7 @@ option {
background-color: #111;
}
.dropdown-header.text-black-50,
.nav-link.active {
color:#fff !important;
}
@@ -373,7 +374,7 @@ pre {
}
.dropdown-menu >li > a {
color: #ccc;
color: #ccc !important;
}
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {

1
view/theme/redbasic/tpl/theme_settings.tpl
View File

@@ -1,6 +1,7 @@
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_checkbox.tpl" field=$advanced_theming}}
{{if $expert}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}}

2
view/tpl/abook_edit.tpl
View File

@@ -485,7 +485,7 @@
</div>
{{if $permcat_enable}}
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
<a href="permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}}
{{/if}}

3
view/tpl/admin_account_edit.tpl
View File

@@ -8,11 +8,10 @@
{{include file="field_password.tpl" field=$pass1}}
{{include file="field_password.tpl" field=$pass2}}
{{include file="field_select.tpl" field=$account_level}}
{{include file="field_select.tpl" field=$account_language}}
{{include file="field_input.tpl" field=$service_class}}
<input type="submit" name="submit" value="{{$submit}}" />
<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
</form>

17
view/tpl/admin_accounts.tpl
View File

@@ -33,15 +33,18 @@
<td class="email">{{$u.account_email}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
<td class="tools">
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
</tbody>
</table>
<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_accounts_deny" value="{{$deny}}"> <input type="submit" name="page_accounts_approve" value="{{$approve}}"></div>
<div class="submit">
<input type="submit" name="page_accounts_deny" class="btn btn-primary" value="{{$deny}}" />
<input type="submit" name="page_accounts_approve" class="btn btn-primary" value="{{$approve}}" />
</div>
{{else}}
<p>{{$no_pending}}</p>
{{/if}}
@@ -73,14 +76,18 @@
<td class="service_class">{{$u.account_service_class}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
<td class="tools">
<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a>
<a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
</tbody>
</table>
<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_accounts_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_accounts_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
<div class="submit">
<input type="submit" name="page_accounts_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" />
<input type="submit" name="page_accounts_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
</div>
{{else}}
NO USERS?!?
{{/if}}

6
view/tpl/admin_channels.tpl
View File

@@ -43,7 +43,11 @@
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>
<div class="submit">
<input type="submit" name="page_channels_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" />
<input type="submit" name="page_channels_code" class="btn btn-primary" value="{{$code}}/{{$uncode}}" />
<input type="submit" name="page_channels_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
</div>
{{else}}
NO CHANNELS?!?
{{/if}}

6
view/tpl/admin_logs.tpl
View File

@@ -2,13 +2,15 @@
<h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/logs" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
{{include file="field_checkbox.tpl" field=$debugging}}
{{include file="field_input.tpl" field=$logfile}}
{{include file="field_select.tpl" field=$loglevel}}
<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
<div class="submit">
<input type="submit" name="page_logs" class="btn btn-primary" value="{{$submit}}" />
</div>
</form>

2
view/tpl/admin_profiles.tpl
View File

@@ -15,7 +15,7 @@
{{include file="field_textarea.tpl" field=$basic}}
{{include file="field_textarea.tpl" field=$advanced}}
<input type="submit" name="submit" value="{{$submit}}" />
<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
</form>

4
view/tpl/admin_security.tpl
View File

@@ -26,8 +26,8 @@
{{include file="field_textarea.tpl" field=$embed_deny}}
<div class="admin-submit-wrapper" >
<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
<div class="admin-submit-wrapper">
<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
</div>
</form>

19
view/tpl/admin_site.tpl
View File

@@ -42,9 +42,6 @@
{{include file="field_input.tpl" field=$sitename}}
{{include file="field_select.tpl" field=$techlevel}}
{{include file="field_checkbox.tpl" field=$techlock}}
{{include file="field_textarea.tpl" field=$banner}}
{{include file="field_textarea.tpl" field=$siteinfo}}
{{include file="field_textarea.tpl" field=$admininfo}}
@@ -64,7 +61,9 @@
{{include file="field_select.tpl" field=$directory_server}}
{{/if}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
</div>
<h3>{{$registration}}</h3>
{{include file="field_input.tpl" field=$register_text}}
@@ -77,7 +76,9 @@
{{include file="field_input.tpl" field=$sellpage}}
{{include file="field_input.tpl" field=$first_page}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
</div>
<h3>{{$corporate}}</h3>
{{include file="field_checkbox.tpl" field=$verify_email}}
@@ -89,7 +90,9 @@
{{include file="field_textarea.tpl" field=$incl}}
{{include file="field_textarea.tpl" field=$excl}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div>
</div>
<h3>{{$advanced}}</h3>
{{include file="field_input.tpl" field=$imagick_path}}
@@ -106,7 +109,9 @@
{{include file="field_input.tpl" field=$default_expire_days}}
{{include file="field_input.tpl" field=$active_expire_days}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<div class="submit">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
</div>
</form>
</div>

5
view/tpl/app.tpl
View File

@@ -11,15 +11,16 @@
<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
</div>
{{/if}}
{{if $install || $update || $delete || $feature}}
{{if $action_label || $update || $delete || $feature}}
<div class="text-center app-tools">
<form action="{{$hosturl}}appman" method="post">
<input type="hidden" name="papp" value="{{$app.papp}}" />
{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-fw fa-arrow-circle-o-down" ></i></button>{{/if}}
{{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}}
{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}}
{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}
{{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}}
{{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
</form>
</div>
{{/if}}

2
view/tpl/channels.tpl
View File

@@ -9,9 +9,11 @@
{{$channel_usage_message}}
</div>
{{/if}}
{{if $desc}}
<div id="channels-desc" class="section-content-info-wrapper">
{{$desc}}
</div>
{{/if}}
{{foreach $all_channels as $chn}}
{{include file="channel.tpl" channel=$chn}}
{{/foreach}}

15
view/tpl/conv_frame.tpl
View File

@@ -4,5 +4,16 @@
<div id="page-spinner" class="spinner-wrapper">
<div class="spinner m"></div>
</div>
<div class="modal" id="conversation_settings" tabindex="-1" role="dialog" aria-labelledby="conversation_settings_label" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title" id="conversation_settings_label">{{$conversation_tools}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body" id="conversation_settings_body">
{{$wait}}
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

10
view/tpl/conv_item.tpl
View File

@@ -175,10 +175,18 @@
{{if $item.drop.dropping}}
<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
{{/if}}
{{if $item.dropdown_extras}}
<div class="dropdown-divider"></div>
{{$item.dropdown_extras}}
{{/if}}
{{if $item.edpost && $item.dreport}}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
{{/if}}
{{if $item.settings}}
<div class="dropdown-divider"></div>
<a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a>
{{/if}}
</div>
</div>
</div>
@@ -206,7 +214,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{{$response.count}} {{$response.button}}</h4>
<h3 class="modal-title">{{$response.count}} {{$response.button}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body response-list">

79
view/tpl/cover_photo_widget.tpl
View File

@@ -2,54 +2,59 @@
var aside_padding_top;
var section_padding_top;
var coverSlid = false;
var hide_cover = Boolean({{$hide_cover}});
var cover_height;
$(document).ready(function() {
if(! $('#cover-photo').length)
return;
aside_padding_top = parseInt($('aside').css('padding-top'));
section_padding_top = parseInt($('section').css('padding-top'));
if($(window).width() < 755) {
$('#cover-photo').remove();
coverSlid = true;
return;
}
$('#cover-photo').removeClass('d-none');
cover_height = Math.ceil($(window).width()/2.75862069);
$('#cover-photo').css('height', cover_height + 'px');
datasrc2src('#cover-photo > img');
$(document).on('click mouseup keyup', slideUpCover);
if($('#cover-photo').length && $(window).width() > 755) {
if($(window).scrollTop() < $('#cover-photo').height()) {
$('.navbar').removeClass('fixed-top');
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('main').css('opacity', 0);
}
if(hide_cover) {
hideCover();
}
else {
$('#cover-photo').remove();
coverSlid = true;
else if(!hide_cover && !coverSlid) {
coverVisibleActions();
}
});
$(window).scroll(function () {
if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
$('.navbar').addClass('fixed-top');
$('main').css('margin-top', '');
$('main').css('opacity', 1);
if($(window).scrollTop() >= cover_height) {
coverHiddenActions();
coverSlid = true;
}
else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
else if ($(window).scrollTop() < cover_height){
if(coverSlid) {
$(window).scrollTop(Math.ceil($('#cover-photo').height()));
$(window).scrollTop(cover_height);
setTimeout(function(){ coverSlid = false; }, 1000);
}
else {
if($(window).scrollTop() < $('#cover-photo').height()) {
$('.navbar').removeClass('fixed-top');
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('main').css('opacity', 0);
if($(window).scrollTop() < cover_height) {
coverVisibleActions();
}
}
}
if($('#cover-photo').length && $('main').css('opacity') < 1) {
$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
if($('main').css('opacity') < 1) {
$('main').css('opacity', ($(window).scrollTop()/cover_height).toFixed(1));
}
});
$(window).resize(function () {
if($('#cover-photo').length && $(window).width() < 755) {
cover_height = Math.ceil($(window).width()/2.75862069);
$('#cover-photo').css('height', cover_height + 'px');
if($(window).width() < 755) {
$('#cover-photo').remove();
$('.navbar').addClass('fixed-top');
$('main').css('opacity', 1);
@@ -62,12 +67,34 @@
if(coverSlid) {
return;
}
$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }, 'fast');
$('html, body').animate({scrollTop: cover_height + 'px'}, 'fast');
return;
}
function hideCover() {
if(coverSlid) {
return;
}
window.scrollTo(0, cover_height);
return;
}
function coverVisibleActions() {
$('body').css('cursor', 'n-resize');
$('.navbar').removeClass('fixed-top');
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('main').css('opacity', 0);
}
function coverHiddenActions() {
$('body').css('cursor', '');
$('.navbar').addClass('fixed-top');
$('main').css('margin-top', '');
$('main').css('opacity', 1);
}
</script>
<div id="cover-photo" title="{{$hovertitle}}">
<div class="d-none" id="cover-photo" title="{{$hovertitle}}">
{{$photo_html}}
<div id="cover-photo-caption">
<h1>{{$title}}</h1>

2
view/tpl/defperms.tpl
View File

@@ -17,7 +17,7 @@
<p>{{$permnote_self}}</p>
</div>
{{if $permcat_enable}}
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
<a href="permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}}
{{/if}}

2
view/tpl/field_select.tpl
View File

@@ -3,5 +3,5 @@
<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}">
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
</select>
<small class="form-text text-muted">{{$field.3}}</small>
<small class="form-text text-muted">{{$field.3}}</small >
</div>

2
view/tpl/follow.tpl
View File

@@ -2,7 +2,7 @@
<h3>{{$connect}}</h3>
<form action="follow" method="post" />
<div class="input-group">
<input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
<input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
<div class="input-group-append">
<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
</div>

2
view/tpl/generic_addon_settings.tpl
View File

@@ -1,4 +1,4 @@
<div class="panel">
<div class="panel" id="settings">
<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
<h3>
<a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content">

4
view/tpl/jot-header.tpl
View File

@@ -7,7 +7,7 @@ var pretext = '{{$pretext}}';
function initEditor(cb){
if(editor == false){
$("#profile-jot-text-loading").show();
$("#profile-jot-reset").removeClass('d-none');
$("#profile-jot-tools").removeClass('d-none');
{{$geotag}}
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
@@ -308,7 +308,7 @@ var activeCommentText = '';
{{if $reset}}
$(".jothidden").hide();
$("#profile-jot-text").removeClass('jot-expanded');
$("#profile-jot-reset").addClass('d-none');
$("#profile-jot-tools").addClass('d-none');
$("#jot-preview-content").html('').hide();
editor = false;
{{else}}

23
view/tpl/jot.tpl
View File

@@ -42,11 +42,16 @@
</div>
{{/if}}
<div id="jot-text-wrap">
{{if $reset}}
<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
<i class="fa fa-close"></i>
</button>
{{/if}}
<div id="profile-jot-tools" class="btn-group d-none">
{{if $is_owner}}
<a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a>
{{/if}}
{{if $reset}}
<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
<i class="fa fa-close"></i>
</button>
{{/if}}
</div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
</div>
{{if $attachment}}
@@ -209,7 +214,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
<h3 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
@@ -236,7 +241,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
<h3 class="modal-title" id="expiryModalLabel">{{$expires}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body form-group" style="width:90%">
@@ -263,7 +268,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
<h3 class="modal-title" id="createdModalLabel">{{$future_txt}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body form-group" style="width:90%">
@@ -290,7 +295,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
<h3 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body" id="embedPhotoModalBody" >

2
view/tpl/js_strings.tpl
View File

@@ -34,7 +34,7 @@
'name_ok1' : "{{$name_ok1}}",
'name_ok2' : "{{$name_ok2}}",
'plural_func' : "{{$plural_func}}",
't01' : "{{$t01}}",
't02' : "{{$t02}}",

10
view/tpl/navbar_default.tpl
View File

@@ -63,14 +63,22 @@
{{/if}}
</div>
{{if $sel.name}}
<div id="nav-app-link-wrapper" class="navbar-nav mr-auto">
<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate">
{{$sel.name}}
{{if $sitelocation}}
<br><small>{{$sitelocation}}</small>
{{/if}}
</a>
</div>
{{if $settings_url}}
<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
<i class="fa fa-fw fa-cog"></i>
</a>
</div>
{{/if}}
{{/if}}
{{/if}}
<div class="navbar-toggler-right">

38
view/tpl/new_channel.tpl
View File

@@ -13,23 +13,25 @@
</div>
{{/if}}
{{/if}}
<form action="new_channel" method="post" id="newchannel-form">
{{if $default_role}}
<input type="hidden" name="permissions_role" value="{{$default_role}}" />
{{else}}
{{include file="field_select_grouped.tpl" field=$role}}
{{/if}}
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$nickname}}
<button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button>
<div id="newchannel-submit-end" class="clear"></div>
<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
<div id="newchannel-import-end" class="clear"></div>
</form>
{{if $canadd}}
<form action="new_channel" method="post" id="newchannel-form">
{{if $default_role}}
<input type="hidden" name="permissions_role" value="{{$default_role}}" />
{{else}}
{{include file="field_select_grouped.tpl" field=$role}}
{{/if}}
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$nickname}}
<button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button>
<div id="newchannel-submit-end" class="clear"></div>
<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
<div id="newchannel-import-end" class="clear"></div>
</form>
{{/if}}
</div>
</div>

11
view/tpl/notes.tpl
View File

@@ -1,5 +1,13 @@
{{if $app}}
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$banner}}</h2>
</div>
<div class="section-content-wrapper">
{{else}}
<div class="widget">
<h3>{{$banner}}</h3>
{{/if}}
<textarea name="note_text" id="note-text">{{$text}}</textarea>
<script>
var noteSaveTimer = null;
@@ -32,4 +40,7 @@
noteSaveTimer = setTimeout(noteSaveChanges,10000);
}
</script>
{{if $app}}
</div>
{{/if}}
</div>

11
view/tpl/notifications_widget.tpl
View File

@@ -5,10 +5,17 @@
$(document).ready(function() {
notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
$('.notifications-btn').click(function() {
if($('#notifications_wrapper').hasClass('fs'))
if($('#notifications_wrapper').hasClass('fs')) {
$('#notifications_wrapper').prependTo('#' + notifications_parent);
else
//undo scrollbar remove
$('section').css('height', '');
}
else {
$('#notifications_wrapper').prependTo('section');
//remove superfluous scrollbar
//setting overflow to hidden here has issues with some browsers
$('section').css('height', '100vh');
}
$('#notifications_wrapper').toggleClass('fs');
if($('#navbar-collapse-2').hasClass('show')){

14
view/tpl/nwiki_page_history.tpl
View File

@@ -43,17 +43,17 @@
{{foreach $pageHistory as $commit}}
<tr class="wikis-index-row"><td>
<table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;">
<tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
<tr><td width="10%">{{$date_lbl}}</td><td width="70%">{{$commit.date}}</td>
<td rowspan="3" width="20%" align="right">
{{if $permsWrite}}
<button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button>
{{if $permsWrite}}
<button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">{{$revert_btn}}</button>
<br><br>
{{/if}}
<button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button>
{{/if}}
<button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">{{$compare_btn}}</button>
</td></tr>
<tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr>
<tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr>
</table>
</td></tr>
{{/foreach}}
</table>
{{/foreach}}
</table>

8
view/tpl/settings_oauth.tpl → view/tpl/oauth.tpl
View File

@@ -4,13 +4,13 @@
</div>
<div class="section-content-tools-wrapper">
<form action="settings/oauth" method="post" autocomplete="off">
<form action="oauth" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="profile-edit-links">
<ul>
<li>
<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
<a id="profile-edit-view-link" href="{{$baseurl}}/oauth/add">{{$add}}</a>
</li>
</ul>
</div>
@@ -25,8 +25,8 @@
{{/if}}
{{/if}}
{{if $app.my}}
<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
{{/if}}
</div>
{{/foreach}}

13
view/tpl/settings_oauth2.tpl → view/tpl/oauth2.tpl
View File

@@ -4,18 +4,19 @@
</div>
<div class="section-content-tools-wrapper">
<form action="settings/oauth2" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="profile-edit-links">
<ul>
<li>
<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth2/add">{{$add}}</a>
<a id="profile-edit-view-link" href="{{$baseurl}}/oauth2/add">{{$add}}</a>
</li>
</ul>
</div>
{{foreach $apps as $app}}
<form action="oauth2" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<input type='hidden' name='name' value='{{$app.client_id}}'>
<div class='oauthapp'>
{{if $app.client_id}}<h4>{{$app.client_id}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
{{if $app.my}}
@@ -24,12 +25,12 @@
{{/if}}
{{/if}}
{{if $app.my}}
<a href="{{$baseurl}}/settings/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/settings/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>
<a href="{{$baseurl}}/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>
{{/if}}
</div>
</form>
{{/foreach}}
</form>
</div>
</div>

0
view/tpl/settings_oauth2_edit.tpl → view/tpl/oauth2_edit.tpl
View File

0
view/tpl/settings_oauth_edit.tpl → view/tpl/oauth_edit.tpl
View File

2
view/tpl/peoplefind.tpl
View File

@@ -2,7 +2,7 @@
<h3>{{$findpeople}}</h3>
<form action="directory" method="post" />
<div class="input-group form-group">
<input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-append">
<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
</div>

10
view/tpl/settings_permcats.tpl → view/tpl/permcats.tpl
View File

@@ -8,7 +8,7 @@
{{$desc}}
</div>
<form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" >
<form action="permcats" id="settings-permcats-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$name}}
@@ -17,10 +17,10 @@
</div>
</div>
<div class="panel">
<div class="panel" id="permission-settings">
<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
<h3>
<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
<a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
{{$permlbl}}
</a>
</h3>
@@ -50,8 +50,8 @@
<table id="permcat-index">
{{foreach $permcats as $k => $v}}
<tr class="permcat-row-{{$k}}">
<td width="99%"><a href="settings/permcats/{{$k}}">{{$v}}</a></td>
<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
<td width="99%"><a href="permcats/{{$k}}">{{$v}}</a></td>
<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
</tr>
{{/foreach}}
</table>

2
view/tpl/profile_advanced.tpl
View File

@@ -5,7 +5,7 @@
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
{{if $profile.likers}}
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="menu-img-1" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
{{/if}}
</div>
{{/if}}

2
view/tpl/searchbox.tpl
View File

@@ -1,7 +1,7 @@
<form action="{{$action_url}}" method="get" >
<input type="hidden" name="f" value="" />
<div id="{{$id}}" class="input-group">
<input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
<input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
<div class="input-group-append">
<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
{{if $savedsearch}}

37
view/tpl/settings.tpl
View File

@@ -161,43 +161,6 @@
</div>
</div>
</div>
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
<h3>
<a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
{{$lbl_misc}}
</a>
</h3>
</div>
<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" >
<div class="section-content-tools-wrapper">
{{if $profselect}}
<label for="contact-profile-selector">{{$profseltxt}}</label>
{{$profselect}}
{{/if}}
{{if $menus}}
<div class="form-group channel-menu">
<label for="channel_menu">{{$menu_desc}}</label>
<select name="channel_menu" class="form-control">
{{foreach $menus as $menu }}
<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
{{/foreach}}
</select>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$cal_first_day}}
{{if $misc_addon}}
{{$misc_addon}}
{{/if}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
</div>
</div>
</div>
</div>
</form>
{{$aclselect}}

6
view/tpl/settings_account.tpl
View File

@@ -12,12 +12,6 @@
{{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}}
{{if ! $techlock}}
{{include file="field_select.tpl" field=$techlevel}}
{{else}}
<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
{{/if}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>

22
view/tpl/settings_addon.tpl Normal file
View File

@@ -0,0 +1,22 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<div class="section-content-wrapper">
{{if $action_url}}
<form action="{{$action_url}}" method="post" autocomplete="off">
{{/if}}
{{if $form_security_token}}
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{/if}}
{{$content}}
{{if $submit}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
{{/if}}
{{if $action_url}}
</form>
{{/if}}
</div>
</div>

10
view/tpl/settings_display.tpl
View File

@@ -58,21 +58,13 @@
<div class="section-content-wrapper">
{{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}}
{{include file="field_input.tpl" field=$channel_divmore_height}}
{{include file="field_input.tpl" field=$network_divmore_height}}
{{include file="field_checkbox.tpl" field=$nosmile}}
{{include file="field_checkbox.tpl" field=$channel_menu}}
{{include file="field_checkbox.tpl" field=$title_tosource}}
{{include file="field_checkbox.tpl" field=$channel_list_mode}}
{{include file="field_checkbox.tpl" field=$network_list_mode}}
{{include file="field_checkbox.tpl" field=$user_scalable}}
{{include file="field_checkbox.tpl" field=$preload_images}}
{{include file="field_checkbox.tpl" field=$manual_update}}
{{if $expert}}
<div class="form-group">
<a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$start_menu}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>

21
view/tpl/settings_features.tpl
View File

@@ -1,31 +1,10 @@
<script>
$(document).ready(function() {
$('#id_techlevel').change(function() {
var techlvl = $('#id_techlevel').val();
window.location.href='{{$baseurl}}/settings/features?f=&techlevel=' + techlvl;
});
});
</script>
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<form action="settings/features" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{if ! $techlock}}
<div class="section-content-tools-wrapper">
{{include file="field_select.tpl" field=$techlevel}}
</div>
{{else}}
<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />
{{/if}}
{{if $hiddens}}
{{foreach $hiddens as $k => $v}}
<input type="hidden" name="feature_{{$k}}" value="{{$v}}" />
{{/foreach}}
{{/if}}
<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
{{foreach $features as $g => $f}}
<div class="panel">

22
view/tpl/settings_module.tpl Executable file
View File

@@ -0,0 +1,22 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
</div>
<div class="section-content-wrapper">
<form action="{{$action_url}}" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{if $rpath}}
<input type='hidden' name='rpath' value='{{$rpath}}'>
{{/if}}
{{foreach $features as $feature}}
{{include file="field_checkbox.tpl" field=$feature}}
{{/foreach}}
{{if $extra_settings_html}}
{{$extra_settings_html}}
{{/if}}
<div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
</form>
</div>
</div>

11
view/tpl/settings_module_ajax.tpl Normal file
View File

@@ -0,0 +1,11 @@
<form id="settings_module_ajax_form" action="{{$action_url}}" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<input type='hidden' name='aj' value='1'>
{{foreach $features as $feature}}
{{include file="field_checkbox.tpl" field=$feature}}
{{/foreach}}
<div class="settings-submit-wrapper" >
<button id="settings_module_ajax_submit" type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div>
</form>

2
view/tpl/sources_new.tpl
View File

@@ -3,7 +3,7 @@
<div class="descriptive-text">{{$desc}}</div>
<form action="sources" method="post">
<form action="sources" method="post" autocomplete="off" >
<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$tags}}

10
view/tpl/settings_tokens.tpl → view/tpl/tokens.tpl
View File

@@ -8,7 +8,7 @@
{{$desc}}
</div>
<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
<form action="tokens" id="settings-account-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
{{include file="field_input.tpl" field=$name}}
@@ -19,10 +19,10 @@
</div>
</div>
<div class="panel">
<div class="panel" id="permission-settings">
<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
<h3>
<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
<a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
{{$permlbl}}
</a>
</h3>
@@ -61,8 +61,8 @@
<table id="atoken-index">
{{foreach $tokens as $t}}
<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
<td width="99%"><a href="tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
</tr>
{{/foreach}}
</table>

13
view/tpl/wiki.tpl
View File

@@ -42,8 +42,8 @@
<div id="wiki-content-container" class="section-content-wrapper">
<ul class="nav nav-tabs" id="wiki-nav-tabs">
<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li>
</ul>
<div class="tab-content" id="wiki-page-tabs">
<div id="edit-pane" class="tab-pane">
@@ -66,7 +66,7 @@
{{if $showPageControls}}
<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
<div class="input-group">
<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
<input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
<div class="input-group-append">
<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
</div>
@@ -98,7 +98,7 @@
<script>
window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}';
window.wiki_page_name = '{{$page|escape:'javascript'}}';
window.wiki_page_content = '{{$content|escape:'javascript'}}';
window.wiki_page_commit = '{{$commit}}';
window.saved = true;
@@ -122,7 +122,7 @@
if (data.success) {
$('#rename-page-form-wrapper').hide();
window.console.log('data: ' + JSON.stringify(data));
window.wiki_page_name = data.name.urlName;
window.wiki_page_name = data.name.htmlName;
$('#wiki-header-page').html(data.name.htmlName);
wiki_refresh_page_list();
} else {
@@ -262,7 +262,8 @@
if (data.success) {
window.saved = true;
window.console.log('Page saved successfully.');
window.wiki_page_content = currentContent;
//window.wiki_page_content = currentContent;
window.wiki_page_content = data.content;
$('#id_commitMsg').val(''); // Clear the commit message box
$('#save-page').addClass('disabled'); // Disable the save button
{{if !$mimeType || $mimeType == 'text/markdown'}}

2
view/tpl/wiki_page_list.tpl
View File

@@ -7,7 +7,7 @@
{{foreach $pages as $page}}
<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
{{if $page.resource_id && $candel}}
<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.title}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title|escape:'javascript'}}', '{{$page.title|escape:'javascript'}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
{{/if}}
<a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
</li>

2
view/tpl/wiki_page_not_found.tpl
View File

@@ -1,7 +1,7 @@
<h3>Page does not exist</h3>
<br /><br /><br />
{{if $canadd}}
<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
<form id="new-page-form" action="/wiki/{{$channel_address}}/create/page" method="post" >
<input type="hidden" name="resource_id" value="{{$resource_id}}">
{{include file="field_input.tpl" field=$pageName}}
{{if $typelock}}

2
view/tpl/wikilist.tpl
View File

@@ -53,7 +53,7 @@
</td>
<td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
{{if $owner}}
<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>
<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title|escape:'javascript'}}', '{{$wiki.resource_id}}'); return false;"></i></td>
{{/if}}
</tr>
{{if $owner}}