Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Post fixes for #339 commits #680

Merged
merged 1 commit into from
Jul 29, 2015
Merged

Post fixes for #339 commits #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions views/includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,10 @@
<!-- JS -->
<script type="text/javascript" charset="UTF-8" src="/redist/npm/jquery/dist/jquery.js"></script>
<script type="text/javascript" charset="UTF-8" src="/redist/npm/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript">
// Google Analytics Code
(function () {
var win = window;
win['GoogleAnalyticsObject'] = 'ga';
win['ga'] = win['ga'] || function () {
(win['ga'].q = win['ga'].q || []).push(arguments);
}

win['ga'].l = 1 * new Date();

ga('create', 'UA-59965387-1', 'auto');
ga('send', 'pageview')
})
</script>
{{> includes/scripts/hideReminders.html }}

{{^isDev}}
<!-- Google Analytics -->
{{> includes/scripts/googleAnalytics.html }}
{{/isDev}}
42 changes: 22 additions & 20 deletions views/includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{{#pageMetaDescription}}<meta name="description" content="{{pageMetaDescription}}">{{/pageMetaDescription}}
{{#pageMetaKeywords}}<meta name="keywords" content="{{pageMetaKeywords}}">{{/pageMetaKeywords}}
<link rel="shortcut icon" href="/images/favicon.ico" >
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{{#pageMetaDescription}}<meta name="description" content="{{pageMetaDescription}}">{{/pageMetaDescription}}
{{#pageMetaKeywords}}<meta name="keywords" content="{{pageMetaKeywords}}">{{/pageMetaKeywords}}
<link rel="shortcut icon" href="/images/favicon.ico" >

<!-- Open Search -->
<link href="/xml/opensearch-groups.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Groups">
<link href="/xml/opensearch-libraries.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Libraries">
<link href="/xml/opensearch-scripts.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Scripts">
<link href="/xml/opensearch-users.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Users">
<!-- Open Search -->
<link href="/xml/opensearch-groups.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Groups">
<link href="/xml/opensearch-libraries.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Libraries">
<link href="/xml/opensearch-scripts.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Scripts">
<link href="/xml/opensearch-users.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Users">

<!-- CSS -->
<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/font-awesome/css/font-awesome.min.css'>
<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/octicons/octicons/octicons.css'>
<link rel="stylesheet" type="text/css" media="all" href="/less/bootstrap/oujs.css">
<link rel="stylesheet" type="text/css" media="all" href="/css/common.css">
<link rel="stylesheet" type="text/css" media="all" href="/css/github.css">

<!-- Google Analytics -->
<script type="text/javascript" src="//www.google-analytics.com/analytics.js" async></script>
<!-- CSS -->
<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/font-awesome/css/font-awesome.min.css'>
<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/octicons/octicons/octicons.css'>
<link rel="stylesheet" type="text/css" media="all" href="/less/bootstrap/oujs.css">
<link rel="stylesheet" type="text/css" media="all" href="/css/common.css">
<link rel="stylesheet" type="text/css" media="all" href="/css/github.css">

{{^isDev}}
<!-- Google Analytics -->
<script type="text/javascript" src="//www.google-analytics.com/analytics.js" async="async"></script>
{{/isDev}}
16 changes: 16 additions & 0 deletions views/includes/scripts/googleAnalytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script type="text/javascript">
(function () {

var win = window;
win['GoogleAnalyticsObject'] = 'ga';
win['ga'] = win['ga'] || function () {
(win['ga'].q = win['ga'].q || []).push(arguments);
}

win['ga'].l = 1 * new Date();

ga('create', 'UA-59965387-1', 'auto');
ga('send', 'pageview');

})();
</script>