home: new UI

4 files changed, 160 insertions, 64 deletions

diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index aed5f488d2..66a15ece20 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -1,32 +1,36 @@
-<div class="wrapper-push"></div>
-</div>
-<footer id="footer">
-    <div class="container footer-wrap">
-    	<div class="row">
-	    	<div class="col-md-6">
-		        <p>© 2014 GoGits · Version: {{AppVer}} ·
-		            Page: <b>{{LoadTimes .PageStartTime}}</b> ·
-		            Template: <b>{{call .TmplLoadTimes}}</b>
-		        </p>
-	        </div>
-
-	    	<div class="col-md-2" style="margin: -5px;">
-		        <a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github fa-2x"></i></a>
-	        </div>
-
-	    	<div class="col-md-4">
-	        	<p class="desc">
-	        		<a href="http://gogs.io">Official Website</a>
-	        	</p>
-	        </div>
-    	</div>
-
-    	<div class="row">
-	    	<div class="col-md-6">
-    			Go Version: {{GoVer}}
-    		</div>
-    	</div>
-    </div>
-</footer>
+	</div>
+	<footer class="ui page grid">
+		<div class="sixteen wide column">
+			<div class="ui left">
+				© 2015 Gogs · {{.i18n.Tr "version"}}: {{AppVer}} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong>
+			</div>
+			<div class="ui right links">
+				<a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github-square"></i></a>
+				<a target="_blank" href="https://twitter.com/gogitservice"><i class="fa fa-twitter"></i></a>
+				<a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i></a>
+				<a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i></a>
+				<!-- <div id="footer-lang" class="inline drop drop-top">{{.i18n.Tr "language"}}
+				    <div class="drop-down">
+				        <ul class="menu menu-vertical switching-list">
+				        	{{range .AllLangs}}
+				            <li><a href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a></li>
+				            {{end}}
+				        </ul>
+				    </div>
+				</div> -->
+				<div class="ui language bottom pointing dropdown link item">
+          <i class="world icon"></i>
+          <div class="text">{{.LangName}}</div>
+          	<div class="menu">
+          		{{range .AllLangs}}
+  						<a class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+  						{{end}}
+						</div>
+        </div>
+				<a target="_blank" href="http://gogs.io">{{.i18n.Tr "website"}}</a>
+				<span class="version">{{GoVer}}</span>
+			</div>
+		</div>
+	</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/base/footer_old.tmpl b/templates/base/footer_old.tmpl
new file mode 100644
index 0000000000..aed5f488d2
--- /dev/null
+++ b/templates/base/footer_old.tmpl
@@ -0,0 +1,32 @@
+<div class="wrapper-push"></div>
+</div>
+<footer id="footer">
+    <div class="container footer-wrap">
+    	<div class="row">
+	    	<div class="col-md-6">
+		        <p>© 2014 GoGits · Version: {{AppVer}} ·
+		            Page: <b>{{LoadTimes .PageStartTime}}</b> ·
+		            Template: <b>{{call .TmplLoadTimes}}</b>
+		        </p>
+	        </div>
+
+	    	<div class="col-md-2" style="margin: -5px;">
+		        <a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github fa-2x"></i></a>
+	        </div>
+
+	    	<div class="col-md-4">
+	        	<p class="desc">
+	        		<a href="http://gogs.io">Official Website</a>
+	        	</p>
+	        </div>
+    	</div>
+
+    	<div class="row">
+	    	<div class="col-md-6">
+    			Go Version: {{GoVer}}
+    		</div>
+    	</div>
+    </div>
+</footer>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index cb3951ea2c..ef6ad56a6c 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -1,41 +1,60 @@
 <!DOCTYPE html>
 <html>
-	<head{{if AppSubUrl}} data-suburl="{{AppSubUrl}}"{{end}}>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
-        <meta name="author" content="Gogs - Go Git Service" />
-		<meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" />
-		<meta name="keywords" content="go, git">
-		<meta name="_csrf" content="{{.CsrfToken}}" />
-		{{if .GoGetImport}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}}
+<head data-suburl="{{AppSubUrl}}">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+	<meta name="author" content="Gogs - Go Git Service" />
+	<meta name="description" content="Gogs(Go Git Service) a painless self-hosted Git Service written in Go" />
+	<meta name="keywords" content="go, git, self-hosted, gogs">
+	<meta name="_csrf" content="{{.CsrfToken}}" />
+	{{if .GoGetImport}}
+	<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">
+	{{end}}
 
-		 <!-- Stylesheets -->
-		{{if CdnMode}}
-		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-		<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
+	<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
 
-		<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-		<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-		{{else}}
-		<link href="{{AppSubUrl}}/css/bootstrap.min.css" rel="stylesheet" />
-		<link href="{{AppSubUrl}}/css/font-awesome.min.css" rel="stylesheet" />
+	{{if CdnMode}}
+	<script src="//code.jquery.com/jquery-1.11.2.min.js"></script>
+	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+	{{else}}
+	<script src="{{AppSubUrl}}/js/jquery-1.11.2.min.js"></script>
+	<link rel="stylesheet" href="{{AppSubUrl}}/css/font-awesome.min.css">
+	{{end}}
 
-		<script src="{{AppSubUrl}}/js/jquery-1.10.1.min.js"></script>
-		<script src="{{AppSubUrl}}/js/bootstrap.min.js"></script>
-		{{end}}
+	<!-- Stylesheet -->
+	<link rel="stylesheet" href="{{AppSubUrl}}/css/semantic.min.css">
+	<link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.min.css">
 
-		<link href="{{AppSubUrl}}/css/todc-bootstrap.min.css" rel="stylesheet" />
-        <link href="{{AppSubUrl}}/css/datepicker3.css" rel="stylesheet" />
-        <link href="{{AppSubUrl}}/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
-		<link href="{{AppSubUrl}}/css/markdown.css" rel="stylesheet" />
-		<link href="{{AppSubUrl}}/css/gogs.css" rel="stylesheet" />
+	<!-- JavaScript -->
+	<script src="{{AppSubUrl}}/js/semantic.min.js"></script>
+	<script src="{{AppSubUrl}}/js/gogs.js"></script>
 
-        <script src="{{AppSubUrl}}/js/lib.js"></script>
-        <script src="{{AppSubUrl}}/js/app.js"></script>
-		<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
-	</head>
-	<body>
-		<div id="wrapper">
-		<noscript>Please enable JavaScript in your browser!</noscript>
\ No newline at end of file
+	<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
+</head>
+<body>
+	<div class="full height">
+		<noscript>Please enable JavaScript in your browser!</noscript>
+		<div class="following bar light">
+		  <div class="ui page grid">
+		    <div class="column">
+		      <div class="ui right floated secondary menu">
+		      	{{if .ShowRegistrationButton}}
+		      	<a class="view-ui item {{if .PageIsSignUp}}active{{end}}" href="{{AppSubUrl}}/user/sign_up"><i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}}</a>
+		      	{{end}}
+		      	<a class="view-ui item {{if .PageIsSignIn}}active{{end}}" href="{{AppSubUrl}}/user/login"><i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}</a>
+		      </div>
+		      <div class="ui secondary menu">
+		      	<img class="img-15 ui image brand" src="{{AppSubUrl}}/img/favicon.png">
+		      	<a class="view-ui item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}</a>
+		      	<a class="view-ui item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore"}}</a>
+		      	<a class="view-ui item" target="_blank" href="http://gogs.io/docs">{{.i18n.Tr "help"}}</a>
+		      	<!-- <div class="item">
+		      	  <div class="ui icon input">
+		      	    <input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
+		      	    <i class="search icon"></i>
+		      	  </div>
+		      	</div> -->
+		      </div>
+		    </div>
+		  </div>
+		</div>
diff --git a/templates/base/head_old.tmpl b/templates/base/head_old.tmpl
new file mode 100644
index 0000000000..cb3951ea2c
--- /dev/null
+++ b/templates/base/head_old.tmpl
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+	<head{{if AppSubUrl}} data-suburl="{{AppSubUrl}}"{{end}}>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+        <meta name="author" content="Gogs - Go Git Service" />
+		<meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" />
+		<meta name="keywords" content="go, git">
+		<meta name="_csrf" content="{{.CsrfToken}}" />
+		{{if .GoGetImport}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}}
+
+		 <!-- Stylesheets -->
+		{{if CdnMode}}
+		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+		<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
+
+		<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+		<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+		{{else}}
+		<link href="{{AppSubUrl}}/css/bootstrap.min.css" rel="stylesheet" />
+		<link href="{{AppSubUrl}}/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="{{AppSubUrl}}/js/jquery-1.10.1.min.js"></script>
+		<script src="{{AppSubUrl}}/js/bootstrap.min.js"></script>
+		{{end}}
+
+		<link href="{{AppSubUrl}}/css/todc-bootstrap.min.css" rel="stylesheet" />
+        <link href="{{AppSubUrl}}/css/datepicker3.css" rel="stylesheet" />
+        <link href="{{AppSubUrl}}/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
+		<link href="{{AppSubUrl}}/css/markdown.css" rel="stylesheet" />
+		<link href="{{AppSubUrl}}/css/gogs.css" rel="stylesheet" />
+
+        <script src="{{AppSubUrl}}/js/lib.js"></script>
+        <script src="{{AppSubUrl}}/js/app.js"></script>
+		<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
+	</head>
+	<body>
+		<div id="wrapper">
+		<noscript>Please enable JavaScript in your browser!</noscript>
\ No newline at end of file