Fix mirror UI style and work on #475

diff --git a/gogs.go b/gogs.go
index f492b2f7f7235b764a2533e2db04b43cabc46a73..f0aebf03673a49594e1825abe58a3bbd5cbdae1d 100644 (file)
--- a/gogs.go
+++ b/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())

diff --git a/models/publickey.go b/models/publickey.go
index 1246cffc587afc87c7a8bb22a3bce641b067339f..dccb89362b7d78aefe0f23924b3607de7d57efe6 100644 (file)
--- a/models/publickey.go
+++ b/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
+                       }
                }
        }
 

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 8f82e0af3a2fe90fa9bafeaea841d17e9471c5d4..db4aad228326b1e88301b80e33daa0603e242325 100644 (file)
--- a/public/ng/css/gogs.css
+++ b/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;

diff --git a/public/ng/less/gogs/dashboard.less b/public/ng/less/gogs/dashboard.less
index afef60cfab7076db00a8f35e217c0f1f3bd03384..60aa807269200ec27f9456af68ce7ea13ba251f1 100644 (file)
--- a/public/ng/less/gogs/dashboard.less
+++ b/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;

diff --git a/templates/.VERSION b/templates/.VERSION
index 6db2a3e6c9941755ddff1a9f92f83e7934f7ba40..261667dbe15798d7ab16bdd84c04015213c21ebc 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.1.0915 Beta
\ No newline at end of file
+0.5.1.0916 Beta
\ No newline at end of file

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index bf0aba097b4bae576c25b407aea2ad01fc6fb1ec..2f9bbc4ed4d25d695cf8593327931356f75ca086 100644 (file)
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/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>