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

Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.

Browse Source
This commit is contained in:
Andrew Manning
2016-08-27 06:52:01 -04:00
parent 420aa4bc44 aea2fa1629
commit ddfc5209d3
26 changed files with 7117 additions and 6819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
view/tpl/admin_site.tpl
View File

@@ -41,6 +41,7 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$sitename}}
{{include file="field_select.tpl" field=$server_role}}
{{include file="field_textarea.tpl" field=$banner}}
{{include file="field_textarea.tpl" field=$admininfo}}
{{include file="field_select.tpl" field=$language}}

23
view/tpl/contact_block.tpl
View File

@@ -1,13 +1,14 @@
<div id="contact-block" class="widget">
<h3>{{$contacts}}</h3>
{{if $micropro}}
{{if $viewconnections}}
<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
{{/if}}
<div class='contact-block-content'>
{{foreach $micropro as $m}}
{{$m}}
{{/foreach}}
</div>
{{/if}}
<h3>{{$contacts}}</h3>
{{if $micropro}}
{{if $viewconnections}}
<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
{{/if}}
<div class='contact-block-content'>
{{foreach $micropro as $m}}
{{$m}}
{{/foreach}}
</div>
{{/if}}
</div>
<div class="clear"></div>

51
view/tpl/cover_photo_widget.tpl
View File

@@ -1,22 +1,28 @@
<script>
var aside_padding_top;
var section_padding_top;
var coverSlid = false;
$(document).ready(function() {
aside_padding_top = parseInt($('aside').css('padding-top'));
section_padding_top = parseInt($('section').css('padding-top'));
$(document).on('click', slideUpCover);
if($('#cover-photo').length && $(window).width() > 755) {
$('.navbar-fixed-top').css('position', 'relative');
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
$('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px');
$('main').css('opacity', 0);
$('header').hide();
if($(window).scrollTop() < $('#cover-photo').height()) {
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
$('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px');
$('.navbar-fixed-top').css('position', 'relative');
$('main').css('opacity', 0);
$('header').hide();
}
}
else {
$('#cover-photo').remove();
coverSlid = true;
}
});
@@ -26,10 +32,26 @@
$('main').css('opacity', 1);
$('aside').css('padding-top', aside_padding_top + 'px');
$('section').css('padding-top', section_padding_top + 'px');
$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
$('.navbar-fixed-top').css('position', 'fixed');
$('.navbar-fixed-top').css('position', '');
$('main').css('margin-top', '');
$('#cover-photo').remove();
coverSlid = true;
}
else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
if(coverSlid) {
$(window).scrollTop(Math.ceil($('#cover-photo').height()));
setTimeout(function(){ coverSlid = false; }, 1000);
}
else {
if($(window).scrollTop() < $('#cover-photo').height()) {
$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
$('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px');
$('.navbar-fixed-top').css('position', 'relative');
$('main').css('opacity', 0);
$('header').hide();
}
}
}
if($('#cover-photo').length) {
$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
@@ -38,21 +60,26 @@
$(window).resize(function () {
if($('#cover-photo').length && $(window).width() < 755) {
$('#cover-photo').remove();
$('main').css('opacity', 1);
$('aside').css('padding-top', aside_padding_top + 'px');
$('section').css('padding-top', section_padding_top + 'px');
$('.navbar-fixed-top').css('position', 'fixed');
$('#cover-photo').remove();
$('.navbar-fixed-top').css('position', '');
coverSlid = true;
}
});
function slideUpCover() {
if(coverSlid) {
return;
}
$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
return;
}
</script>
<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}">
<div id="cover-photo" title="{{$hovertitle}}">
{{$photo_html}}
<div id="cover-photo-caption">
<div class="cover-photo-title">

2
view/tpl/install_settings.tpl
View File

@@ -19,7 +19,7 @@
{{include file="field_input.tpl" field=$adminmail}}
{{include file="field_input.tpl" field=$siteurl}}
{{include file="field_checkbox.tpl" field=$advanced}}
{{include file="field_select.tpl" field=$server_role}}
{{include file="field_select_grouped.tpl" field=$timezone}}