ui and js update

2024-12-22 04:47:55 +01:00 · 2014-03-17 15:17:44 +08:00 · 2014-03-17 15:17:44 +08:00 · 24d91ecda8
commit 24d91ecda8
parent 3a2eee0827
13 changed files with 47 additions and 41 deletions
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@ -51,7 +51,6 @@ html, body {
 .gogs-masthead {
    background-color: #428bca;
    box-shadow: inset 0 -2px 5px rgba(0, 0, 0, .1);
-    padding: 0 16px;
    margin: 0;
 }

@ -133,6 +132,11 @@ html, body {
    padding: 5px 0;
    margin-left: 10px;
    height: 28px;
+    float: right;
+}
+
+#gogs-nav-signin{
+    float: right;
 }

 #gogs-nav-out .fa {
@ -349,10 +353,6 @@ html, body {

 /* #gogs-feed */

-#gogs-feed-left {
-    padding-left: 0;
-}
-
 #gogs-feed-right .repo-panel .panel-heading .btn {
    margin-top: -4px;
 }
@ -635,7 +635,7 @@ html, body {
 }

 #footer .footer-wrap {
-    padding: 20px 0;
+    padding: 20px 15px;
 }

 #footer a {
--- a/public/js/app.js
+++ b/public/js/app.js
@ -43,7 +43,15 @@ var Gogits = {
    Gogits.initTabs = function () {
        var $tabs = $('[data-init=tabs]');
        $tabs.find("li:eq(0) a").tab("show");
+    };
+
+    // render markdown
+    Gogits.renderMarkdown = function () {
+        var $pre = $('.markdown').find('pre > code').parent();
+        $pre.addClass("prettyprint");
+        prettyPrint();
    }
+
 })(jQuery);

 // ajax utils
@ -70,6 +78,7 @@ function initCore() {
    Gogits.initTooltips();
    Gogits.initTabs();
    Gogits.initModals();
+    Gogits.renderMarkdown();
 }

 function initRegister() {
@ -98,14 +107,14 @@ function initRegister() {
    });
 }

-function initUserSetting(){
+function initUserSetting() {
    $('#gogs-ssh-keys .delete').confirmation({
        singleton: true,
-        onConfirm: function(e, $this){
-            Gogits.ajaxDelete("",{"id":$this.data("del")},function(json){
-                if(json.ok){
+        onConfirm: function (e, $this) {
+            Gogits.ajaxDelete("", {"id": $this.data("del")}, function (json) {
+                if (json.ok) {
                    window.location.reload();
-                }else{
+                } else {
                    alert(json.err);
                }
            });
@ -113,11 +122,15 @@ function initUserSetting(){
    });
 }

-;(function($){
-    // on Dom Ready
-    $(function(){
-        var $pre = $('.markdown').find('pre > code').parent();
-        $pre.addClass("prettyprint");
-        prettyPrint();
+(function ($) {
+    $(function () {
+        initCore();
+        var body = $("#gogs-body");
+        if (body.data("page") == "user-signup") {
+            initRegister();
+        }
+        if (body.data("page") == "user") {
+            initUserSetting();
+        }
    });
 })(jQuery);
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@ -1,19 +1,12 @@
-<script>
-    $(function(){
-        initCore();{{if .PageIsSignUp}}
-        initRegister();{{end}}{{if .PageIsUserSetting}}
-        initUserSetting();{{end}}
-    });
-</script>
-	<div class="wrapper-push"></div>
+<div class="wrapper-push"></div>
 </div>
 <footer id="footer">
-	<div class="container footer-wrap">
-		<p>
-			© 2014 Gogs · ver {{AppVer}} · <i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a>
-		</p>
-		<p class="desc"></p>
-	</div>
+    <div class="container footer-wrap">
+        <p>© 2014 Gogs · ver {{AppVer}} ·
+            <i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a>
+        </p>
+        <p class="desc"></p>
+    </div>
 </footer>
 </body>
 </html>
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@ -11,7 +11,7 @@
        <h3>News Feed</h3>
    </div>
 </div>
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
    <div id="gogs-feed-left" class="col-md-8">
        <ul class="list-unstyled activity-list">
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/notification.tmpl
+++ b/templates/user/notification.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-profile" class="col-md-3">
        <div class="profile-avatar text-center">
            <a href="{{.Owner.HomeLink}}" class="center-block" data-toggle="tooltip" data-placement="bottom" title="Change Avatar">
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/security.tmpl
+++ b/templates/user/security.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
    <div id="gogs-user-setting-nav" class="col-md-3">
        <h4>Account Setting</h4>
        <ul class="list-group">
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container" id="gogs-body">
+<div class="container" id="gogs-body" data-page="user-signin">
    <form action="/user/login" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
        <h3>Log in</h3>
        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container" id="gogs-body">
+<div class="container" id="gogs-body" data-page="user-signup">
 	<form action="/user/sign_up" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
        <h3>Sign Up</h3>
 	    <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>