浏览代码

Fix mirror UI style and work on #475

Unknwon 10 年之前
父节点
当前提交
c1ceec45da
共有 6 个文件被更改,包括 15 次插入12 次删除
  1. 1 1
      gogs.go
  2. 9 4
      models/publickey.go
  3. 1 1
      public/ng/css/gogs.css
  4. 1 3
      public/ng/less/gogs/dashboard.less
  5. 1 1
      templates/.VERSION
  6. 2 2
      templates/user/dashboard/dashboard.tmpl

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.1.0915 Beta"
+const APP_VER = "0.5.1.0916 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 9 - 4
models/publickey.go

@@ -14,6 +14,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -160,10 +161,14 @@ func saveAuthorizedKeyFile(key *PublicKey) error {
 	if err != nil {
 		return err
 	}
-	if finfo.Mode().Perm() > 0600 {
-		log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
-		if err = f.Chmod(0600); err != nil {
-			return err
+
+	// FIXME: following command does not support in Windows.
+	if runtime.GOOS != "windows" {
+		if finfo.Mode().Perm() > 0600 {
+			log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
+			if err = f.Chmod(0600); err != nil {
+				return err
+			}
 		}
 	}
 

+ 1 - 1
public/ng/css/gogs.css

@@ -686,7 +686,7 @@ ol.linenums {
   width: auto;
 }
 /*
-The dashboard page style
+    The dashboard page style
 */
 #dashboard-header {
   border-bottom: 1px solid #d6d6d6;

+ 1 - 3
public/ng/less/gogs/dashboard.less

@@ -1,9 +1,7 @@
 @import "../ui/var";
-
 /*
-The dashboard page style
+    The dashboard page style
 */
-
 @dashboardHeaderBorderColor: #D6D6D6;
 @dashboardHeaderLinkColor: #444;
 @dashboardHeaderLinkHoverColor: #D9453D;

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.5.1.0915 Beta
+0.5.1.0916 Beta

+ 2 - 2
templates/user/dashboard/dashboard.tmpl

@@ -9,7 +9,7 @@
                 <div class="avatar left">
                     <img class="avatar-30" src="{{AvatarLink .GetActEmail}}" alt="">
                 </div>
-                <div class="content left {{if eq .GetOpType 5}}push-news{{end}}">
+                <div class="content left {{if eq .GetOpType 5}}push-news{{end}} grid-4-5">
                     <p class="text-bold">
                         <a href="/{{.GetActUserName}}">{{.GetActUserName}}</a>
                         {{if eq .GetOpType 1}}
@@ -30,7 +30,7 @@
                             {{ $push := ActionContent2Commits .}}
                             {{ $repoLink := .GetRepoLink}}
                             {{range $push.Commits}}
-                            <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> {{.Message}}</li>
+                            <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li>
                             {{end}}
                         </ul>
                     </div>