mgo package changed to 'gopkg.in/mgo.v2/bson'

app/controllers/AlbumController.go

@@ -4,7 +4,7 @@ import (
 	"github.com/revel/revel"
 //	"encoding/json"
 	"github.com/leanote/leanote/app/info"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	. "github.com/leanote/leanote/app/lea"
 //	"io/ioutil"
 )

app/controllers/BaseController.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"github.com/revel/revel"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"encoding/json"
 	"github.com/leanote/leanote/app/info"
 //	"io/ioutil"

app/controllers/BlogController.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	. "leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
 //	"github.com/leanote/leanote/app/types"

app/controllers/NoteController.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/lea/html2image"
 	"github.com/leanote/leanote/app/info"

app/controllers/NotebookController.go

@@ -4,7 +4,7 @@ import (
 	"github.com/revel/revel"
 //	"encoding/json"
 	"github.com/leanote/leanote/app/info"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	. "github.com/leanote/leanote/app/lea"
 //	"io/ioutil"
 )

app/controllers/ShareController.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
-//	"labix.org/v2/mgo/bson"
+//	"gopkg.in/mgo.v2/bson"
 //	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
 //	"github.com/leanote/leanote/app/types"

app/controllers/UserController.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"github.com/revel/revel"
 //	"encoding/json"
-//	"labix.org/v2/mgo/bson"
+//	"gopkg.in/mgo.v2/bson"
 	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/info"
 //	"github.com/leanote/leanote/app/types"

app/db/Mgo.go

@@ -2,8 +2,8 @@ package db
 
 import (
 	"fmt"
-	"labix.org/v2/mgo"
+	"gopkg.in/mgo.v2"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"github.com/revel/revel"
 )
 

app/info/AlbumInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/BlogInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 只为blog, 不为note

app/info/FileInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/NoteInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/NotebookInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/ShareNotebookNoteInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/SuggestionInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 建议

app/info/TagInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // 这里主要是为了统计每个tag的note数目

app/info/TokenInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/info/UserInfo.go

@@ -1,7 +1,7 @@
 package info
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/lea/Util.go

@@ -8,7 +8,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"io"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 	math_rand "math/rand" 
 )

app/service/AlbumService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 //	. "github.com/leanote/leanote/app/lea"
 	"github.com/leanote/leanote/app/db"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/service/AuthService.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	"github.com/revel/revel"

app/service/BlogService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 //	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	"time"
 //	"sort"
 )

app/service/FileService.go

@@ -5,7 +5,7 @@ import (
 	"github.com/revel/revel"
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 	"os"
 )

app/service/NoteContentHistoryService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 //	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	"time"
 )
 

app/service/NoteService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 )
 

app/service/NotebookService.go

@@ -2,7 +2,7 @@ package service
 
 import (
 //	"fmt"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 //	. "github.com/leanote/leanote/app/lea"

app/service/PwdService.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"

app/service/ShareService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 //	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 	"sort"
 )

app/service/SuggestionService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 //	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	"time"
 //	"sort"
 )

app/service/TagService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 //	"time"
 )
 

app/service/TokenService.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 	. "github.com/leanote/leanote/app/lea"

app/service/TrashService.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"github.com/leanote/leanote/app/db"
 	"github.com/leanote/leanote/app/info"
 )

app/service/UserService.go

@@ -4,7 +4,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"github.com/leanote/leanote/app/db"
 	. "github.com/leanote/leanote/app/lea"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 	"time"
 	"strings"
 	"fmt"

app/test/TestNoteService.go

@@ -11,8 +11,8 @@ import (
 	"github.com/leanote/leanote/app/lea/html2image"
 	"time"
 	"fmt"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
-//	"labix.org/v2/mgo"
+//	"gopkg.in/mgo.v2"
 //	"encoding/json"
 //	"strings"
 )

app/views/Home/header.html

@@ -27,7 +27,7 @@ function log(o) {
 		<div class="pull-left">
 			<h1>
 				<a href="/index">
-					<img src="/images/logo.png" id="" style="height: 40px" title="leanote, Your own cloud note!"/>
+					<img src="/images/logo/leanote.png" id="" style="height: 50px" title="leanote, Your own cloud note!"/>
 				</a>
 			</h1>
 		</div>

app/views/Note/note-dev.html

@@ -45,9 +45,8 @@ function log(o) {
 			  </div>
 			-->
 				<div id="logo" class="pull-left">
-					<span>lea</span>note 
+					<!--<span>lea</span>note -->
-					<!-- <img style="height: 45px;" src="/images/logo.png" title="leanote, 不一样的笔记" alt="leanote">
+					<img style="height: 45px;" src="/images/logo/leanote_green.png" title="leanote, 不一样的笔记" alt="leanote">
-					 -->
 				</div>
 				<div id="switcher" class="pull-left">
 					 <i class="fa fa-align-justify" id="leftSwitcher" title="{{msg . "leftHidden"}}"></i>