aaron/garchive-wp-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into deploy/prod

Browse source
This commit is contained in:
Aaron Yarborough 2019-01-15 19:49:26 +00:00
commit 811ae9c3bc
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
header.php
View file

@ -6,14 +6,13 @@
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-75664743-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-75664743-2');
gtag('config', 'UA-75664743-2');
</script>
<meta charset="<?php bloginfo('charset'); ?>"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="description" content="A collection of scripts and other content made by Graal Online players"/>
@ -24,18 +23,19 @@
<body <?php body_class(); ?>>
<?php
$curr_user = wp_get_current_user();
$curr_user = wp_get_current_user();
?>
<div class="gar-userbox">
<?php if ($curr_user->ID !== 0) : ?>
<span class="gar-userbox-username"><?php echo $curr_user->user_login ?></span>
<a href="<?php echo wp_logout_url(esc_url(home_url('/'))) ?>">Logout</a>
<?php else : ?>
<a href="<?php echo wp_login_url(esc_url(home_url('/'))) ?>">Login</a>
<?php endif; ?>
</div>
<?php /*
<div class="gar-userbox">
<?php if ($curr_user->ID !== 0) : ?>
<span class="gar-userbox-username"><?php echo $curr_user->user_login ?></span>
<a href="<?php echo wp_logout_url(esc_url(home_url('/'))) ?>">Logout</a>
<?php else : ?>
<a href="<?php echo wp_login_url(esc_url(home_url('/'))) ?>">Login</a>
<?php endif; ?>
</div>
*/ ?>
<div id="search">

2
scripts/main.js
View file

@ -9,7 +9,7 @@
searchbox = $('#searchBox')
initPostGrid(postGrid, '.gar-post-box');
initSearch('a[data-toggle=search]', search, searchbox);
initSearch('a[href="#search"]', search, searchbox);
initTinyMCE('.rte');
});