aadil/fedi-tumblr
0
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Emoji picker, Search and Themes updates

Browse Source
This commit is contained in:
Daisuke
2020-04-13 11:30:51 -05:00
parent cf0ba1244d
commit 299c58692e
120 changed files with 224 additions and 9206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/footer.php
View File

@ -64,6 +64,16 @@ $query = http_build_query(array_filter(array(
$('body').on('click', '.compose', function(e) {
$('#postform').toggle();
});
$('body').on('click', '.searchform', function(e) {
$(this).prev().toggle();
});
$('body').on('click', '.searchmobiletoggle', function(e) {
$('#usermenu').off('hover');
$('#usermenu').off('active');
$('#searchmobile').toggle();
});
$("body").on("keydown", "form", function (e) {
if (e.ctrlKey && e.keyCode === 13) {
@ -71,8 +81,8 @@ $query = http_build_query(array_filter(array(
}
});
$('.topicon').click(function(){
$('.topicon').each(function(a){
$('.tlicon').click(function(){
$('.tlicon').each(function(a){
$( this ).removeClass('tiselected')
});
$( this ).addClass('tiselected');

52
layout/header.php
View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
<title>Dashboard FE</title>
<title><?php echo $setting['appname']; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" media='screen and (min-width: 801px)' href='<?php echo themes("file","css/style.css")?>?id=<?php echo mt_rand(1000, 2500); ?>' />
<link rel="stylesheet" media='screen and (max-width: 800px)' href='<?php echo themes("file","css/mobile.css")?>?id=<?php echo mt_rand(1000, 2500); ?>' />
@ -75,41 +75,42 @@ if ($logedin) {
<div class="topbar" style='text-align:center; background-color:none;'>
<div class="topbar" style='position:fixed; top:0px; left:0px; height:45px; z-index:99;'>
<span style='float:left; line-height:45px;margin-left:10px;'>
<a href="./<?php echo ($logedin ? "?mode=home" : ""); ?>" style="font-family: 'patua', serif; font-weight:bold; color:white; font-size:20px; text-decoration:none">Dashboard FE</a>
<a href="./<?php echo ($logedin ? "?mode=home" : ""); ?>" style="font-family: 'patua', serif; font-weight:bold; color:white; font-size:20px; text-decoration:none"><?php echo $setting['appname']; ?></a>
</span>
<?php if ($logedin): ?>
<span class='mid' style='margin:0 auto; height:100%;'>
<span class="topbutton" style='position:relative;'>
<a href='?mode=federated' class='fontello topicon ldr <?php echo ($tl['mode'] == "federated" ? "tiselected" : "");?>'>&#xe83c;</a>
<a href='?mode=federated' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "federated" ? "tiselected" : "");?>'>&#xe83c;</a>
</span>
<span class="topbutton" style='position:relative;'>
<a href='?mode=home' class='fontello topicon ldr <?php echo ($tl['mode'] == "home" ? "tiselected" : "");?>'>&#xe816;</a>
<a href='?mode=home' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "home" ? "tiselected" : "");?>'>&#xe816;</a>
</span>
<span class="topbutton" style='position:relative;'>
<a href='?mode=local' class='fontello topicon ldr <?php echo ($tl['mode'] == "local" ? "tiselected" : "");?>'>&#xf1e0;</a>
<a href='?mode=local' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "local" ? "tiselected" : "");?>'>&#xf1e0;</a>
</span>
<span class="topbutton" style='position:relative;'>
<a href='?mode=favourites' class='fontello topicon ldr <?php echo ($tl['mode'] == "favourites" ? "tiselected" : "");?>'>&#xe804;</a>
<a href='?mode=favourites' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "favourites" ? "tiselected" : "");?>'>&#xe804;</a>
</span>
<span class="topbutton" style='position:relative;'>
<a href='?mode=direct' class='fontello topicon ldr <?php echo ($tl['mode'] == "direct" ? "tiselected" : "");?>'>&#xf0e0;</a>
<a href='?mode=direct' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "direct" ? "tiselected" : "");?>'>&#xf0e0;</a>
</span>
<?php if (isset($user_settings['pleroma'])): ?>
<span class="topbutton" style='position:relative;'>
<a href='?mode=bookmarks' class='fontello topicon ldr <?php echo ($tl['mode'] == "bookmarks" ? "tiselected" : "");?>'>&#xe81e;</a>
<a href='?mode=bookmarks' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "bookmarks" ? "tiselected" : "");?>'>&#xe81e;</a>
</span>
<?php
endif; ?>
<?php endif; ?>
</span>
<?php
endif; ?>
<?php endif; ?>
<span style='float:right; margin-right:20px; height:100%;'>
<?php if ($logedin): ?>
<span class="topbutton desktop" style='position:relative;'>
<div style='position:absolute; left:-200px; display:none;' class="search"><form method='get'><input type='text' name='search' style='width:150px' placeholder='Type your search here'><input type='submit' value='&#xe800;' class='fontello'></form></div>
<a href='?page=search' class='searchform fontello topicon' onClick='return false'>&#xe800;</a>
</span>
<span class="topbutton mobile compose" style='position:relative;'>
<a href='' onClick='return false;' class='fontello topicon' style='text-decoration:none; display:inline; font-size:20px;'>&#xe824;</a>
@ -133,11 +134,10 @@ endif; ?>
<li class='mobile' style=''><a class='fontello ldr link' href='?mode=direct' onClick='return false'>&#xf0e0; Direct</a></li>
<?php if (isset($user_settings['pleroma'])): ?>
<li class='mobile' style=''><a class='fontello ldr link' href='?mode=bookmarks' onClick='return false'>&#xe81e; Bookmarks</a></li>
<?php
endif; ?>
<?php endif; ?>
<li class='mobile' style=''><a class='fontello searchmobiletoggle link' href='?page=search' onClick='return false;'>&#xe800; Search</a></li>
<li class='mobile' style=''></li>
<?php
endif; ?>
<?php endif; ?>
<li style=''><a class='fontello ldr link' href='?page=settings' onClick='return false'>&#xe82d; Settings</a></li>
<li style=''><a class='fontello link' href='./logout'>&#xe832; Log Out</a></li>
</ul>
@ -177,9 +177,19 @@ endif; ?>
<div class='wrapper'>
<div class='container'>
<div id='posts'>
<?php
if ($logedin) {
?>
<?php if ($logedin) { ?>
<div class='element' id="searchmobile">
<div class='avatar' style='background-image:url(:avatar:) :style:'></div>
<div class='searchmobile' style="padding-top: 15px; padding-bottom: 15px;">
<form method="get">
<span class="searchmobiletoggle" style='padding-left:0px;padding-right:5px;font-weight:bold;'>X</span>
<input type="text" name="search" style='width:70%' placeholder="Type your search here">
<input type="submit" value="&#xe800;" class="fontello">
</form>
</div>
</div>
<div class='element' id='postform' style=''>
<div class='avatar' style='background-image:url(<?php echo $user_settings['avatar']; ?>)'></div>
<div class='postform form' style='display:block;'>

6
layout/sidebar.php
View File

@ -12,6 +12,10 @@ if ($logedin || $tl['mode'] == 'user') {
<br><span>(@" . $info['acct'] . ")</span>
</div>
</div>
<div class='side_element' style='margin-top:20px; margin-left:0px; width:100%; padding-top:10px; padding-bottom:10px; '>
<form method='get'><input type='text' name='search' style='width:80%' placeholder='Type your search here'><input type='submit' value='&#xe800;' class='fontello'></form>
</div>
<div class='side_element' style='margin-top:20px; margin-left:0px; width:100%;'>
<ul>
@ -39,8 +43,10 @@ if ($logedin) {
}
else {
echo "<div class='side_element'>
<div style='width:90%; margin:8px; display:inline-block;'>
<span style='font-weight:bold; font-size:20px; clear:both;'>" . $setting['appname'] . "</span><br>
<span>" . $setting['description'] . "</span>
</div>
</div>";
}
?>