Explorar o código

[Rebase] Reconciling changes from upstream

- Header template fixes and third-party asset updates
Achilleas Koutsou %!s(int64=6) %!d(string=hai) anos
pai
achega
ca026c682f
Modificáronse 1 ficheiros con 26 adicións e 28 borrados
  1. 26 28
      templates/base/head.tmpl

+ 26 - 28
templates/base/head.tmpl

@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
 <head data-suburl="{{AppSubURL}}">
 <head data-suburl="{{AppSubURL}}">
-	<head data-suburl="{{AppSubURL}}">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-		<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-		{{if or .PageIsExploreRepositories (or .PageIsHome .PageIsWiki) }}
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+	{{if or .PageIsExploreRepositories (or .PageIsHome .PageIsWiki) }}
 		<meta name="robots" content="nofollow"/>
 		<meta name="robots" content="nofollow"/>
 		{{else if .PageIsViewFiles }}
 		{{else if .PageIsViewFiles }}
 		<meta name="robots" content="noindex,nofollow"/>
 		<meta name="robots" content="noindex,nofollow"/>
@@ -32,37 +31,37 @@
 		<meta property="og:title" content="{{.Owner.Name}}{{if .Owner.FullName}} ({{.Owner.FullName}}){{end}}">
 		<meta property="og:title" content="{{.Owner.Name}}{{if .Owner.FullName}} ({{.Owner.FullName}}){{end}}">
 		<meta property="og:description" content="{{.Owner.Name}} has {{.Owner.NumFollowers}} followers and is following {{.Owner.NumFollowing}} people.">
 		<meta property="og:description" content="{{.Owner.Name}} has {{.Owner.NumFollowers}} followers and is following {{.Owner.NumFollowing}} people.">
 		<meta property="og:image" content="{{.Owner.AvatarLink}}" />
 		<meta property="og:image" content="{{.Owner.AvatarLink}}" />
-		{{else if .Repository}}
+	{{else if .Repository}}
 		<meta property="og:url" content="{{.Repository.HTMLURL}}" />
 		<meta property="og:url" content="{{.Repository.HTMLURL}}" />
 		<meta property="og:type" content="object" />
 		<meta property="og:type" content="object" />
 		<meta property="og:title" content="{{.Repository.FullName}}">
 		<meta property="og:title" content="{{.Repository.FullName}}">
 		<meta property="og:description" content="{{.Repository.Description}}">
 		<meta property="og:description" content="{{.Repository.Description}}">
 		<meta property="og:image" content="{{.Repository.Owner.AvatarLink}}" />
 		<meta property="og:image" content="{{.Repository.Owner.AvatarLink}}" />
-		{{else}}
+	{{else}}
 		<meta property="og:url" content="{{AppURL}}" />
 		<meta property="og:url" content="{{AppURL}}" />
 		<meta property="og:type" content="website" />
 		<meta property="og:type" content="website" />
 		<meta property="og:title" content="{{AppName}}">
 		<meta property="og:title" content="{{AppName}}">
-		<meta property="og:description" content="Gin is a data repository for science">
+		<meta property="og:description" content="GIN is a data repository for science">
 		<meta property="og:image" content="{{AppURL}}img/gogs-lg.png" />
 		<meta property="og:image" content="{{AppURL}}img/gogs-lg.png" />
-		<meta property="og:site_name" content="Gin">
-		{{end}}
+		<meta property="og:site_name" content="GIN">
+	{{end}}
 
 
-		<link rel="shortcut icon" href="{{AppSubURL}}/img/favicon.png"/>
+	<link rel="shortcut icon" href="{{AppSubURL}}/img/favicon.png"/>
 		<script src="{{AppSubURL}}/js/jquery-1.11.3.min.js"></script>
 		<script src="{{AppSubURL}}/js/jquery-1.11.3.min.js"></script>
 		<script src="{{AppSubURL}}/js/libs/jquery.are-you-sure.js"></script>
 		<script src="{{AppSubURL}}/js/libs/jquery.are-you-sure.js"></script>
 		<script src="{{AppSubURL}}/js/libs/js.cookie.js"></script>
 		<script src="{{AppSubURL}}/js/libs/js.cookie.js"></script>
 		<link rel="stylesheet" href="{{AppSubURL}}/assets/font-awesome-4.6.3/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{{AppSubURL}}/assets/font-awesome-4.6.3/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{{AppSubURL}}/assets/octicons-4.3.0/octicons.min.css">
 		<link rel="stylesheet" href="{{AppSubURL}}/assets/octicons-4.3.0/octicons.min.css">
 
 
-		<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
+	<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
 
 
-		<!-- notebook.js for rendering ipython notebooks and marked.js for rendering markdown in notebooks -->
-		{{if .IsIPythonNotebook}}
-		<script src="{{AppSubURL}}/plugins/notebookjs-0.2.6/notebook.min.js"></script>
+	<!-- notebook.js for rendering ipython notebooks and marked.js for rendering markdown in notebooks -->
+	{{if .IsIPythonNotebook}}
+		<script src="{{AppSubURL}}/plugins/notebookjs-0.3.0/notebook.min.js"></script>
 		<script src="{{AppSubURL}}/plugins/marked-0.3.6/marked.min.js"></script>
 		<script src="{{AppSubURL}}/plugins/marked-0.3.6/marked.min.js"></script>
-		{{end}}
+	{{end}}
 
 
-		{{if .IsOdML}}
+	{{if .IsOdML}}
 		<script type="text/javascript" src="{{AppSubURL}}/plugins/xonomy/xonomy.js"></script>
 		<script type="text/javascript" src="{{AppSubURL}}/plugins/xonomy/xonomy.js"></script>
 		<link type="text/css" rel="stylesheet" href="{{AppSubURL}}/plugins/xonomy/xonomy.css"/>
 		<link type="text/css" rel="stylesheet" href="{{AppSubURL}}/plugins/xonomy/xonomy.css"/>
 
 
@@ -89,21 +88,21 @@
 		<script>
 		<script>
 			CodeMirror.modeURL =  "{{AppSubURL}}/plugins/codemirror-5.17.0/mode/%N/%N.js";
 			CodeMirror.modeURL =  "{{AppSubURL}}/plugins/codemirror-5.17.0/mode/%N/%N.js";
 		</script>
 		</script>
-		{{end}}
+	{{end}}
 
 
-		<!-- Stylesheet -->
-		<link rel="stylesheet" href="{{AppSubURL}}/css/semantic-2.2.10.min.css">
-		<link rel="stylesheet" href="{{AppSubURL}}/css/gogs.css?v={{MD5 AppVer}}">
+	<!-- Stylesheet -->
+	<link rel="stylesheet" href="{{AppSubURL}}/css/semantic-2.3.1.min.css">
+	<link rel="stylesheet" href="{{AppSubURL}}/css/gogs.css?v={{MD5 AppVer}}">
 
 
-		<!-- JavaScript -->
-		<script src="{{AppSubURL}}/js/semantic-2.2.10.min.js"></script>
-		<script src="{{AppSubURL}}/js/gogs.js?v={{MD5 AppVer}}"></script>
+	<!-- JavaScript -->
+	<script src="{{AppSubURL}}/js/semantic-2.3.1.min.js"></script>
+	<script src="{{AppSubURL}}/js/gogs.js?v={{MD5 AppVer}}"></script>
 
 
-		<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
+	<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
 
 
-		<meta name="theme-color" content="{{ThemeColorMetaTag}}">
-		<!-- twitterish -->
-		<meta name="twitter:card" content="summary" />
+	<meta name="theme-color" content="{{ThemeColorMetaTag}}">
+	<!-- twitterish -->
+	<meta name="twitter:card" content="summary" />
 		<meta name="twitter:site" content="@gnode" />
 		<meta name="twitter:site" content="@gnode" />
 		<meta name="twitter:title" content=" GIN" />
 		<meta name="twitter:title" content=" GIN" />
 		<meta name="twitter:description" content="Modern Research Data Management for Neuroscience"/>
 		<meta name="twitter:description" content="Modern Research Data Management for Neuroscience"/>
@@ -126,7 +125,6 @@
 				<div class="ui container">
 				<div class="ui container">
 					<div class="ui grid">
 					<div class="ui grid">
 						<div class="column">
 						<div class="column">
-
 							<div class="ui top secondary menu">
 							<div class="ui top secondary menu">
 								<a class="item brand" href="{{AppSubURL}}/">
 								<a class="item brand" href="{{AppSubURL}}/">
 									<img class="ui mini image" src="{{AppSubURL}}/img/favicon.png">
 									<img class="ui mini image" src="{{AppSubURL}}/img/favicon.png">