`+
+ ``, c.FieldIdName, value, c.URLPrefix, value, c.URLPrefix, value))
+}
+
+// create a new captcha id
+func (c *Captcha) CreateCaptcha() (string, error) {
+ // generate captcha id
+ id := string(base.RandomCreateBytes(15))
+
+ // get the captcha chars
+ chars := c.genRandChars()
+
+ // save to store
+ if err := c.store.Put(c.key(id), chars, c.Expiration); err != nil {
+ return "", err
+ }
+
+ return id, nil
+}
+
+// verify from a request
+func (c *Captcha) VerifyReq(req *http.Request) bool {
+ req.ParseForm()
+ return c.Verify(req.Form.Get(c.FieldIdName), req.Form.Get(c.FieldCaptchaName))
+}
+
+// direct verify id and challenge string
+func (c *Captcha) Verify(id string, challenge string) (success bool) {
+ if len(challenge) == 0 || len(id) == 0 {
+ return
+ }
+
+ var chars []byte
+
+ key := c.key(id)
+
+ if v, ok := c.store.Get(key).([]byte); ok && len(v) == len(challenge) {
+ chars = v
+ } else {
+ return
+ }
+
+ defer func() {
+ // finally remove it
+ c.store.Delete(key)
+ }()
+
+ // verify challenge
+ for i, c := range chars {
+ if c != challenge[i]-48 {
+ return
+ }
+ }
+
+ return true
+}
+
+// create a new captcha.Captcha
+func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha {
+ cpt := &Captcha{}
+ cpt.store = store
+ cpt.FieldIdName = fieldIdName
+ cpt.FieldCaptchaName = fieldCaptchaName
+ cpt.ChallengeNums = challengeNums
+ cpt.Expiration = expiration
+ cpt.CachePrefix = cachePrefix
+ cpt.StdWidth = stdWidth
+ cpt.StdHeight = stdHeight
+
+ if len(urlPrefix) == 0 {
+ urlPrefix = defaultURLPrefix
+ }
+
+ if urlPrefix[len(urlPrefix)-1] != '/' {
+ urlPrefix += "/"
+ }
+
+ cpt.URLPrefix = urlPrefix
+
+ base.TemplateFuncs["CreateCaptcha"] = cpt.CreateCaptchaHtml
+ return cpt
+}
diff --git a/modules/captcha/image.go b/modules/captcha/image.go
new file mode 100644
index 0000000000..c9972ba2c3
--- /dev/null
+++ b/modules/captcha/image.go
@@ -0,0 +1,487 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package captcha
+
+import (
+ "bytes"
+ "image"
+ "image/color"
+ "image/png"
+ "io"
+ "math"
+)
+
+const (
+ fontWidth = 11
+ fontHeight = 18
+ blackChar = 1
+
+ // Standard width and height of a captcha image.
+ stdWidth = 240
+ stdHeight = 80
+ // Maximum absolute skew factor of a single digit.
+ maxSkew = 0.7
+ // Number of background circles.
+ circleCount = 20
+)
+
+var font = [][]byte{
+ { // 0
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ },
+ { // 1
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ },
+ { // 2
+ 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ },
+ { // 3
+ 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ },
+ { // 4
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,
+ 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
+ 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
+ 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ },
+ { // 5
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ },
+ { // 6
+ 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0,
+ 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0,
+ 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ },
+ { // 7
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+ },
+ { // 8
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
+ 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ },
+ { // 9
+ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
+ 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
+ 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
+ 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+ },
+}
+
+type Image struct {
+ *image.Paletted
+ numWidth int
+ numHeight int
+ dotSize int
+}
+
+var prng = &siprng{}
+
+// randIntn returns a pseudorandom non-negative int in range [0, n).
+func randIntn(n int) int {
+ return prng.Intn(n)
+}
+
+// randInt returns a pseudorandom int in range [from, to].
+func randInt(from, to int) int {
+ return prng.Intn(to+1-from) + from
+}
+
+// randFloat returns a pseudorandom float64 in range [from, to].
+func randFloat(from, to float64) float64 {
+ return (to-from)*prng.Float64() + from
+}
+
+func randomPalette() color.Palette {
+ p := make([]color.Color, circleCount+1)
+ // Transparent color.
+ p[0] = color.RGBA{0xFF, 0xFF, 0xFF, 0x00}
+ // Primary color.
+ prim := color.RGBA{
+ uint8(randIntn(129)),
+ uint8(randIntn(129)),
+ uint8(randIntn(129)),
+ 0xFF,
+ }
+ p[1] = prim
+ // Circle colors.
+ for i := 2; i <= circleCount; i++ {
+ p[i] = randomBrightness(prim, 255)
+ }
+ return p
+}
+
+// NewImage returns a new captcha image of the given width and height with the
+// given digits, where each digit must be in range 0-9.
+func NewImage(digits []byte, width, height int) *Image {
+ m := new(Image)
+ m.Paletted = image.NewPaletted(image.Rect(0, 0, width, height), randomPalette())
+ m.calculateSizes(width, height, len(digits))
+ // Randomly position captcha inside the image.
+ maxx := width - (m.numWidth+m.dotSize)*len(digits) - m.dotSize
+ maxy := height - m.numHeight - m.dotSize*2
+ var border int
+ if width > height {
+ border = height / 5
+ } else {
+ border = width / 5
+ }
+ x := randInt(border, maxx-border)
+ y := randInt(border, maxy-border)
+ // Draw digits.
+ for _, n := range digits {
+ m.drawDigit(font[n], x, y)
+ x += m.numWidth + m.dotSize
+ }
+ // Draw strike-through line.
+ m.strikeThrough()
+ // Apply wave distortion.
+ m.distort(randFloat(5, 10), randFloat(100, 200))
+ // Fill image with random circles.
+ m.fillWithCircles(circleCount, m.dotSize)
+ return m
+}
+
+// encodedPNG encodes an image to PNG and returns
+// the result as a byte slice.
+func (m *Image) encodedPNG() []byte {
+ var buf bytes.Buffer
+ if err := png.Encode(&buf, m.Paletted); err != nil {
+ panic(err.Error())
+ }
+ return buf.Bytes()
+}
+
+// WriteTo writes captcha image in PNG format into the given writer.
+func (m *Image) WriteTo(w io.Writer) (int64, error) {
+ n, err := w.Write(m.encodedPNG())
+ return int64(n), err
+}
+
+func (m *Image) calculateSizes(width, height, ncount int) {
+ // Goal: fit all digits inside the image.
+ var border int
+ if width > height {
+ border = height / 4
+ } else {
+ border = width / 4
+ }
+ // Convert everything to floats for calculations.
+ w := float64(width - border*2)
+ h := float64(height - border*2)
+ // fw takes into account 1-dot spacing between digits.
+ fw := float64(fontWidth + 1)
+ fh := float64(fontHeight)
+ nc := float64(ncount)
+ // Calculate the width of a single digit taking into account only the
+ // width of the image.
+ nw := w / nc
+ // Calculate the height of a digit from this width.
+ nh := nw * fh / fw
+ // Digit too high?
+ if nh > h {
+ // Fit digits based on height.
+ nh = h
+ nw = fw / fh * nh
+ }
+ // Calculate dot size.
+ m.dotSize = int(nh / fh)
+ // Save everything, making the actual width smaller by 1 dot to account
+ // for spacing between digits.
+ m.numWidth = int(nw) - m.dotSize
+ m.numHeight = int(nh)
+}
+
+func (m *Image) drawHorizLine(fromX, toX, y int, colorIdx uint8) {
+ for x := fromX; x <= toX; x++ {
+ m.SetColorIndex(x, y, colorIdx)
+ }
+}
+
+func (m *Image) drawCircle(x, y, radius int, colorIdx uint8) {
+ f := 1 - radius
+ dfx := 1
+ dfy := -2 * radius
+ xo := 0
+ yo := radius
+
+ m.SetColorIndex(x, y+radius, colorIdx)
+ m.SetColorIndex(x, y-radius, colorIdx)
+ m.drawHorizLine(x-radius, x+radius, y, colorIdx)
+
+ for xo < yo {
+ if f >= 0 {
+ yo--
+ dfy += 2
+ f += dfy
+ }
+ xo++
+ dfx += 2
+ f += dfx
+ m.drawHorizLine(x-xo, x+xo, y+yo, colorIdx)
+ m.drawHorizLine(x-xo, x+xo, y-yo, colorIdx)
+ m.drawHorizLine(x-yo, x+yo, y+xo, colorIdx)
+ m.drawHorizLine(x-yo, x+yo, y-xo, colorIdx)
+ }
+}
+
+func (m *Image) fillWithCircles(n, maxradius int) {
+ maxx := m.Bounds().Max.X
+ maxy := m.Bounds().Max.Y
+ for i := 0; i < n; i++ {
+ colorIdx := uint8(randInt(1, circleCount-1))
+ r := randInt(1, maxradius)
+ m.drawCircle(randInt(r, maxx-r), randInt(r, maxy-r), r, colorIdx)
+ }
+}
+
+func (m *Image) strikeThrough() {
+ maxx := m.Bounds().Max.X
+ maxy := m.Bounds().Max.Y
+ y := randInt(maxy/3, maxy-maxy/3)
+ amplitude := randFloat(5, 20)
+ period := randFloat(80, 180)
+ dx := 2.0 * math.Pi / period
+ for x := 0; x < maxx; x++ {
+ xo := amplitude * math.Cos(float64(y)*dx)
+ yo := amplitude * math.Sin(float64(x)*dx)
+ for yn := 0; yn < m.dotSize; yn++ {
+ r := randInt(0, m.dotSize)
+ m.drawCircle(x+int(xo), y+int(yo)+(yn*m.dotSize), r/2, 1)
+ }
+ }
+}
+
+func (m *Image) drawDigit(digit []byte, x, y int) {
+ skf := randFloat(-maxSkew, maxSkew)
+ xs := float64(x)
+ r := m.dotSize / 2
+ y += randInt(-r, r)
+ for yo := 0; yo < fontHeight; yo++ {
+ for xo := 0; xo < fontWidth; xo++ {
+ if digit[yo*fontWidth+xo] != blackChar {
+ continue
+ }
+ m.drawCircle(x+xo*m.dotSize, y+yo*m.dotSize, r, 1)
+ }
+ xs += skf
+ x = int(xs)
+ }
+}
+
+func (m *Image) distort(amplude float64, period float64) {
+ w := m.Bounds().Max.X
+ h := m.Bounds().Max.Y
+
+ oldm := m.Paletted
+ newm := image.NewPaletted(image.Rect(0, 0, w, h), oldm.Palette)
+
+ dx := 2.0 * math.Pi / period
+ for x := 0; x < w; x++ {
+ for y := 0; y < h; y++ {
+ xo := amplude * math.Sin(float64(y)*dx)
+ yo := amplude * math.Cos(float64(x)*dx)
+ newm.SetColorIndex(x, y, oldm.ColorIndexAt(x+int(xo), y+int(yo)))
+ }
+ }
+ m.Paletted = newm
+}
+
+func randomBrightness(c color.RGBA, max uint8) color.RGBA {
+ minc := min3(c.R, c.G, c.B)
+ maxc := max3(c.R, c.G, c.B)
+ if maxc > max {
+ return c
+ }
+ n := randIntn(int(max-maxc)) - int(minc)
+ return color.RGBA{
+ uint8(int(c.R) + n),
+ uint8(int(c.G) + n),
+ uint8(int(c.B) + n),
+ uint8(c.A),
+ }
+}
+
+func min3(x, y, z uint8) (m uint8) {
+ m = x
+ if y < m {
+ m = y
+ }
+ if z < m {
+ m = z
+ }
+ return
+}
+
+func max3(x, y, z uint8) (m uint8) {
+ m = x
+ if y > m {
+ m = y
+ }
+ if z > m {
+ m = z
+ }
+ return
+}
diff --git a/modules/captcha/image_test.go b/modules/captcha/image_test.go
new file mode 100644
index 0000000000..35810d0c72
--- /dev/null
+++ b/modules/captcha/image_test.go
@@ -0,0 +1,42 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package captcha
+
+import (
+ "testing"
+
+ "github.com/gogits/gogs/modules/base"
+)
+
+type byteCounter struct {
+ n int64
+}
+
+func (bc *byteCounter) Write(b []byte) (int, error) {
+ bc.n += int64(len(b))
+ return len(b), nil
+}
+
+func BenchmarkNewImage(b *testing.B) {
+ b.StopTimer()
+ d := base.RandomCreateBytes(challengeNums, defaultChars...)
+ b.StartTimer()
+ for i := 0; i < b.N; i++ {
+ NewImage(d, stdWidth, stdHeight)
+ }
+}
+
+func BenchmarkImageWriteTo(b *testing.B) {
+ b.StopTimer()
+ d := base.RandomCreateBytes(challengeNums, defaultChars...)
+ b.StartTimer()
+ counter := &byteCounter{}
+ for i := 0; i < b.N; i++ {
+ img := NewImage(d, stdWidth, stdHeight)
+ img.WriteTo(counter)
+ b.SetBytes(counter.n)
+ counter.n = 0
+ }
+}
diff --git a/modules/captcha/siprng.go b/modules/captcha/siprng.go
new file mode 100644
index 0000000000..c059b9f7bf
--- /dev/null
+++ b/modules/captcha/siprng.go
@@ -0,0 +1,267 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package captcha
+
+import (
+ "crypto/rand"
+ "encoding/binary"
+ "io"
+ "sync"
+)
+
+// siprng is PRNG based on SipHash-2-4.
+type siprng struct {
+ mu sync.Mutex
+ k0, k1, ctr uint64
+}
+
+// siphash implements SipHash-2-4, accepting a uint64 as a message.
+func siphash(k0, k1, m uint64) uint64 {
+ // Initialization.
+ v0 := k0 ^ 0x736f6d6570736575
+ v1 := k1 ^ 0x646f72616e646f6d
+ v2 := k0 ^ 0x6c7967656e657261
+ v3 := k1 ^ 0x7465646279746573
+ t := uint64(8) << 56
+
+ // Compression.
+ v3 ^= m
+
+ // Round 1.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ // Round 2.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ v0 ^= m
+
+ // Compress last block.
+ v3 ^= t
+
+ // Round 1.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ // Round 2.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ v0 ^= t
+
+ // Finalization.
+ v2 ^= 0xff
+
+ // Round 1.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ // Round 2.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ // Round 3.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ // Round 4.
+ v0 += v1
+ v1 = v1<<13 | v1>>(64-13)
+ v1 ^= v0
+ v0 = v0<<32 | v0>>(64-32)
+
+ v2 += v3
+ v3 = v3<<16 | v3>>(64-16)
+ v3 ^= v2
+
+ v0 += v3
+ v3 = v3<<21 | v3>>(64-21)
+ v3 ^= v0
+
+ v2 += v1
+ v1 = v1<<17 | v1>>(64-17)
+ v1 ^= v2
+ v2 = v2<<32 | v2>>(64-32)
+
+ return v0 ^ v1 ^ v2 ^ v3
+}
+
+// rekey sets a new PRNG key, which is read from crypto/rand.
+func (p *siprng) rekey() {
+ var k [16]byte
+ if _, err := io.ReadFull(rand.Reader, k[:]); err != nil {
+ panic(err.Error())
+ }
+ p.k0 = binary.LittleEndian.Uint64(k[0:8])
+ p.k1 = binary.LittleEndian.Uint64(k[8:16])
+ p.ctr = 1
+}
+
+// Uint64 returns a new pseudorandom uint64.
+// It rekeys PRNG on the first call and every 64 MB of generated data.
+func (p *siprng) Uint64() uint64 {
+ p.mu.Lock()
+ if p.ctr == 0 || p.ctr > 8*1024*1024 {
+ p.rekey()
+ }
+ v := siphash(p.k0, p.k1, p.ctr)
+ p.ctr++
+ p.mu.Unlock()
+ return v
+}
+
+func (p *siprng) Int63() int64 {
+ return int64(p.Uint64() & 0x7fffffffffffffff)
+}
+
+func (p *siprng) Uint32() uint32 {
+ return uint32(p.Uint64())
+}
+
+func (p *siprng) Int31() int32 {
+ return int32(p.Uint32() & 0x7fffffff)
+}
+
+func (p *siprng) Intn(n int) int {
+ if n <= 0 {
+ panic("invalid argument to Intn")
+ }
+ if n <= 1<<31-1 {
+ return int(p.Int31n(int32(n)))
+ }
+ return int(p.Int63n(int64(n)))
+}
+
+func (p *siprng) Int63n(n int64) int64 {
+ if n <= 0 {
+ panic("invalid argument to Int63n")
+ }
+ max := int64((1 << 63) - 1 - (1<<63)%uint64(n))
+ v := p.Int63()
+ for v > max {
+ v = p.Int63()
+ }
+ return v % n
+}
+
+func (p *siprng) Int31n(n int32) int32 {
+ if n <= 0 {
+ panic("invalid argument to Int31n")
+ }
+ max := int32((1 << 31) - 1 - (1<<31)%uint32(n))
+ v := p.Int31()
+ for v > max {
+ v = p.Int31()
+ }
+ return v % n
+}
+
+func (p *siprng) Float64() float64 { return float64(p.Int63()) / (1 << 63) }
diff --git a/modules/captcha/siprng_test.go b/modules/captcha/siprng_test.go
new file mode 100644
index 0000000000..3b10fe58bf
--- /dev/null
+++ b/modules/captcha/siprng_test.go
@@ -0,0 +1,23 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package captcha
+
+import "testing"
+
+func TestSiphash(t *testing.T) {
+ good := uint64(0xe849e8bb6ffe2567)
+ cur := siphash(0, 0, 0)
+ if cur != good {
+ t.Fatalf("siphash: expected %x, got %x", good, cur)
+ }
+}
+
+func BenchmarkSiprng(b *testing.B) {
+ b.SetBytes(8)
+ p := &siprng{}
+ for i := 0; i < b.N; i++ {
+ p.Uint64()
+ }
+}
diff --git a/modules/git/blob.go b/modules/git/blob.go
new file mode 100644
index 0000000000..3ce462a3c2
--- /dev/null
+++ b/modules/git/blob.go
@@ -0,0 +1,26 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "bytes"
+ "errors"
+ "io"
+
+ "github.com/Unknwon/com"
+)
+
+type Blob struct {
+ repo *Repository
+ *TreeEntry
+}
+
+func (b *Blob) Data() (io.Reader, error) {
+ stdout, stderr, err := com.ExecCmdDirBytes(b.repo.Path, "git", "show", b.Id.String())
+ if err != nil {
+ return nil, errors.New(string(stderr))
+ }
+ return bytes.NewBuffer(stdout), nil
+}
diff --git a/modules/git/commit.go b/modules/git/commit.go
new file mode 100644
index 0000000000..52348fefed
--- /dev/null
+++ b/modules/git/commit.go
@@ -0,0 +1,86 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "container/list"
+ "strings"
+)
+
+// Commit represents a git commit.
+type Commit struct {
+ Tree
+ Id sha1 // The id of this commit object
+ Author *Signature
+ Committer *Signature
+ CommitMessage string
+
+ parents []sha1 // sha1 strings
+}
+
+// Return the commit message. Same as retrieving CommitMessage directly.
+func (c *Commit) Message() string {
+ return c.CommitMessage
+}
+
+func (c *Commit) Summary() string {
+ return strings.Split(c.CommitMessage, "\n")[0]
+}
+
+// Return oid of the parent number n (0-based index). Return nil if no such parent exists.
+func (c *Commit) ParentId(n int) (id sha1, err error) {
+ if n >= len(c.parents) {
+ err = IdNotExist
+ return
+ }
+ return c.parents[n], nil
+}
+
+// Return parent number n (0-based index)
+func (c *Commit) Parent(n int) (*Commit, error) {
+ id, err := c.ParentId(n)
+ if err != nil {
+ return nil, err
+ }
+ parent, err := c.repo.getCommit(id)
+ if err != nil {
+ return nil, err
+ }
+ return parent, nil
+}
+
+// Return the number of parents of the commit. 0 if this is the
+// root commit, otherwise 1,2,...
+func (c *Commit) ParentCount() int {
+ return len(c.parents)
+}
+
+func (c *Commit) CommitsBefore() (*list.List, error) {
+ return c.repo.getCommitsBefore(c.Id)
+}
+
+func (c *Commit) CommitsBeforeUntil(commitId string) (*list.List, error) {
+ ec, err := c.repo.GetCommit(commitId)
+ if err != nil {
+ return nil, err
+ }
+ return c.repo.CommitsBetween(c, ec)
+}
+
+func (c *Commit) CommitsCount() (int, error) {
+ return c.repo.commitsCount(c.Id)
+}
+
+func (c *Commit) SearchCommits(keyword string) (*list.List, error) {
+ return c.repo.searchCommits(c.Id, keyword)
+}
+
+func (c *Commit) CommitsByRange(page int) (*list.List, error) {
+ return c.repo.commitsByRange(c.Id, page)
+}
+
+func (c *Commit) GetCommitOfRelPath(relPath string) (*Commit, error) {
+ return c.repo.getCommitOfRelPath(c.Id, relPath)
+}
diff --git a/modules/git/commit_archive.go b/modules/git/commit_archive.go
new file mode 100644
index 0000000000..23b4b058dd
--- /dev/null
+++ b/modules/git/commit_archive.go
@@ -0,0 +1,36 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "fmt"
+
+ "github.com/Unknwon/com"
+)
+
+type ArchiveType int
+
+const (
+ ZIP ArchiveType = iota + 1
+ TARGZ
+)
+
+func (c *Commit) CreateArchive(path string, archiveType ArchiveType) error {
+ var format string
+ switch archiveType {
+ case ZIP:
+ format = "zip"
+ case TARGZ:
+ format = "tar.gz"
+ default:
+ return fmt.Errorf("unknown format: %v", archiveType)
+ }
+
+ _, stderr, err := com.ExecCmdDir(c.repo.Path, "git", "archive", "--format="+format, "-o", path, c.Id.String())
+ if err != nil {
+ return fmt.Errorf("%s", stderr)
+ }
+ return nil
+}
diff --git a/modules/git/repo.go b/modules/git/repo.go
new file mode 100644
index 0000000000..14ac39a3ed
--- /dev/null
+++ b/modules/git/repo.go
@@ -0,0 +1,27 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "path/filepath"
+)
+
+// Repository represents a Git repository.
+type Repository struct {
+ Path string
+
+ commitCache map[sha1]*Commit
+ tagCache map[sha1]*Tag
+}
+
+// OpenRepository opens the repository at the given path.
+func OpenRepository(repoPath string) (*Repository, error) {
+ repoPath, err := filepath.Abs(repoPath)
+ if err != nil {
+ return nil, err
+ }
+
+ return &Repository{Path: repoPath}, nil
+}
diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go
new file mode 100644
index 0000000000..726019c1b1
--- /dev/null
+++ b/modules/git/repo_branch.go
@@ -0,0 +1,38 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "errors"
+ "strings"
+
+ "github.com/Unknwon/com"
+)
+
+func IsBranchExist(repoPath, branchName string) bool {
+ _, _, err := com.ExecCmdDir(repoPath, "git", "show-ref", "--verify", "refs/heads/"+branchName)
+ return err == nil
+}
+
+func (repo *Repository) IsBranchExist(branchName string) bool {
+ return IsBranchExist(repo.Path, branchName)
+}
+
+func (repo *Repository) GetBranches() ([]string, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "show-ref", "--heads")
+ if err != nil {
+ return nil, errors.New(stderr)
+ }
+ infos := strings.Split(stdout, "\n")
+ branches := make([]string, len(infos)-1)
+ for i, info := range infos[:len(infos)-1] {
+ parts := strings.Split(info, " ")
+ if len(parts) != 2 {
+ continue // NOTE: I should believe git will not give me wrong string.
+ }
+ branches[i] = strings.TrimPrefix(parts[1], "refs/heads/")
+ }
+ return branches, nil
+}
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
new file mode 100644
index 0000000000..0e39963e68
--- /dev/null
+++ b/modules/git/repo_commit.go
@@ -0,0 +1,291 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "bytes"
+ "container/list"
+ "errors"
+ "strings"
+ "sync"
+
+ "github.com/Unknwon/com"
+)
+
+func (repo *Repository) getCommitIdOfRef(refpath string) (string, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "show-ref", "--verify", refpath)
+ if err != nil {
+ return "", errors.New(stderr)
+ }
+ return strings.Split(stdout, " ")[0], nil
+}
+
+func (repo *Repository) GetCommitIdOfBranch(branchName string) (string, error) {
+ return repo.getCommitIdOfRef("refs/heads/" + branchName)
+}
+
+// get branch's last commit or a special commit by id string
+func (repo *Repository) GetCommitOfBranch(branchName string) (*Commit, error) {
+ commitId, err := repo.GetCommitIdOfBranch(branchName)
+ if err != nil {
+ return nil, err
+ }
+ return repo.GetCommit(commitId)
+}
+
+func (repo *Repository) GetCommitIdOfTag(tagName string) (string, error) {
+ return repo.getCommitIdOfRef("refs/tags/" + tagName)
+}
+
+func (repo *Repository) GetCommitOfTag(tagName string) (*Commit, error) {
+ commitId, err := repo.GetCommitIdOfTag(tagName)
+ if err != nil {
+ return nil, err
+ }
+ return repo.GetCommit(commitId)
+}
+
+// Parse commit information from the (uncompressed) raw
+// data from the commit object.
+// \n\n separate headers from message
+func parseCommitData(data []byte) (*Commit, error) {
+ commit := new(Commit)
+ commit.parents = make([]sha1, 0, 1)
+ // we now have the contents of the commit object. Let's investigate...
+ nextline := 0
+l:
+ for {
+ eol := bytes.IndexByte(data[nextline:], '\n')
+ switch {
+ case eol > 0:
+ line := data[nextline : nextline+eol]
+ spacepos := bytes.IndexByte(line, ' ')
+ reftype := line[:spacepos]
+ switch string(reftype) {
+ case "tree":
+ id, err := NewIdFromString(string(line[spacepos+1:]))
+ if err != nil {
+ return nil, err
+ }
+ commit.Tree.Id = id
+ case "parent":
+ // A commit can have one or more parents
+ oid, err := NewIdFromString(string(line[spacepos+1:]))
+ if err != nil {
+ return nil, err
+ }
+ commit.parents = append(commit.parents, oid)
+ case "author":
+ sig, err := newSignatureFromCommitline(line[spacepos+1:])
+ if err != nil {
+ return nil, err
+ }
+ commit.Author = sig
+ case "committer":
+ sig, err := newSignatureFromCommitline(line[spacepos+1:])
+ if err != nil {
+ return nil, err
+ }
+ commit.Committer = sig
+ }
+ nextline += eol + 1
+ case eol == 0:
+ commit.CommitMessage = string(data[nextline+1:])
+ break l
+ default:
+ break l
+ }
+ }
+ return commit, nil
+}
+
+func (repo *Repository) getCommit(id sha1) (*Commit, error) {
+ if repo.commitCache != nil {
+ if c, ok := repo.commitCache[id]; ok {
+ return c, nil
+ }
+ } else {
+ repo.commitCache = make(map[sha1]*Commit, 10)
+ }
+
+ data, bytErr, err := com.ExecCmdDirBytes(repo.Path, "git", "cat-file", "-p", id.String())
+ if err != nil {
+ return nil, errors.New(string(bytErr))
+ }
+
+ commit, err := parseCommitData(data)
+ if err != nil {
+ return nil, err
+ }
+ commit.repo = repo
+ commit.Id = id
+
+ repo.commitCache[id] = commit
+ return commit, nil
+}
+
+// Find the commit object in the repository.
+func (repo *Repository) GetCommit(commitId string) (*Commit, error) {
+ id, err := NewIdFromString(commitId)
+ if err != nil {
+ return nil, err
+ }
+
+ return repo.getCommit(id)
+}
+
+func (repo *Repository) commitsCount(id sha1) (int, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "rev-list", "--count", id.String())
+ if err != nil {
+ return 0, errors.New(stderr)
+ }
+ return com.StrTo(strings.TrimSpace(stdout)).Int()
+}
+
+// used only for single tree, (]
+func (repo *Repository) CommitsBetween(last *Commit, before *Commit) (*list.List, error) {
+ l := list.New()
+ if last == nil || last.ParentCount() == 0 {
+ return l, nil
+ }
+
+ var err error
+ cur := last
+ for {
+ if cur.Id.Equal(before.Id) {
+ break
+ }
+ l.PushBack(cur)
+ if cur.ParentCount() == 0 {
+ break
+ }
+ cur, err = cur.Parent(0)
+ if err != nil {
+ return nil, err
+ }
+ }
+ return l, nil
+}
+
+func (repo *Repository) commitsBefore(lock *sync.Mutex, l *list.List, parent *list.Element, id sha1, limit int) error {
+ commit, err := repo.getCommit(id)
+ if err != nil {
+ return err
+ }
+
+ var e *list.Element
+ if parent == nil {
+ e = l.PushBack(commit)
+ } else {
+ var in = parent
+ for {
+ if in == nil {
+ break
+ } else if in.Value.(*Commit).Id.Equal(commit.Id) {
+ return nil
+ } else {
+ if in.Next() == nil {
+ break
+ }
+ if in.Value.(*Commit).Committer.When.Equal(commit.Committer.When) {
+ break
+ }
+
+ if in.Value.(*Commit).Committer.When.After(commit.Committer.When) &&
+ in.Next().Value.(*Commit).Committer.When.Before(commit.Committer.When) {
+ break
+ }
+ }
+ in = in.Next()
+ }
+
+ e = l.InsertAfter(commit, in)
+ }
+
+ var pr = parent
+ if commit.ParentCount() > 1 {
+ pr = e
+ }
+
+ for i := 0; i < commit.ParentCount(); i++ {
+ id, err := commit.ParentId(i)
+ if err != nil {
+ return err
+ }
+ err = repo.commitsBefore(lock, l, pr, id, 0)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (repo *Repository) CommitsCount(commitId string) (int, error) {
+ id, err := NewIdFromString(commitId)
+ if err != nil {
+ return 0, err
+ }
+ return repo.commitsCount(id)
+}
+
+func (repo *Repository) FileCommitsCount(branch, file string) (int, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "rev-list", "--count",
+ branch, "--", file)
+ if err != nil {
+ return 0, errors.New(stderr)
+ }
+ return com.StrTo(strings.TrimSpace(stdout)).Int()
+}
+
+func (repo *Repository) CommitsByFileAndRange(branch, file string, page int) (*list.List, error) {
+ stdout, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "log", branch,
+ "--skip="+com.ToStr((page-1)*50), "--max-count=50", prettyLogFormat, "--", file)
+ if err != nil {
+ return nil, errors.New(string(stderr))
+ }
+ return parsePrettyFormatLog(repo, stdout)
+}
+
+func (repo *Repository) getCommitsBefore(id sha1) (*list.List, error) {
+ l := list.New()
+ lock := new(sync.Mutex)
+ err := repo.commitsBefore(lock, l, nil, id, 0)
+ return l, err
+}
+
+func (repo *Repository) searchCommits(id sha1, keyword string) (*list.List, error) {
+ stdout, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "log", id.String(), "-100",
+ "-i", "--grep="+keyword, prettyLogFormat)
+ if err != nil {
+ return nil, err
+ } else if len(stderr) > 0 {
+ return nil, errors.New(string(stderr))
+ }
+ return parsePrettyFormatLog(repo, stdout)
+}
+
+func (repo *Repository) commitsByRange(id sha1, page int) (*list.List, error) {
+ stdout, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "log", id.String(),
+ "--skip="+com.ToStr((page-1)*50), "--max-count=50", prettyLogFormat)
+ if err != nil {
+ return nil, errors.New(string(stderr))
+ }
+ return parsePrettyFormatLog(repo, stdout)
+}
+
+func (repo *Repository) getCommitOfRelPath(id sha1, relPath string) (*Commit, error) {
+ stdout, _, err := com.ExecCmdDir(repo.Path, "git", "log", "-1", prettyLogFormat, id.String(), "--", relPath)
+ if err != nil {
+ return nil, err
+ }
+
+ id, err = NewIdFromString(string(stdout))
+ if err != nil {
+ return nil, err
+ }
+
+ return repo.getCommit(id)
+}
diff --git a/modules/workers/worker.go b/modules/git/repo_object.go
similarity index 50%
rename from modules/workers/worker.go
rename to modules/git/repo_object.go
index 97535b2b4d..da79f2c731 100644
--- a/modules/workers/worker.go
+++ b/modules/git/repo_object.go
@@ -2,9 +2,13 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
-package workers
+package git
-// Work represents a background work interface of any kind.
-type Work interface {
- Do() error
-}
+type ObjectType string
+
+const (
+ COMMIT ObjectType = "commit"
+ TREE ObjectType = "tree"
+ BLOB ObjectType = "blob"
+ TAG ObjectType = "tag"
+)
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go
new file mode 100644
index 0000000000..21818f3e6b
--- /dev/null
+++ b/modules/git/repo_tag.go
@@ -0,0 +1,104 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "errors"
+ "strings"
+
+ "github.com/Unknwon/com"
+)
+
+func IsTagExist(repoPath, tagName string) bool {
+ _, _, err := com.ExecCmdDir(repoPath, "git", "show-ref", "--verify", "refs/tags/"+tagName)
+ return err == nil
+}
+
+func (repo *Repository) IsTagExist(tagName string) bool {
+ return IsTagExist(repo.Path, tagName)
+}
+
+// GetTags returns all tags of given repository.
+func (repo *Repository) GetTags() ([]string, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "tag", "-l")
+ if err != nil {
+ return nil, errors.New(stderr)
+ }
+ tags := strings.Split(stdout, "\n")
+ return tags[:len(tags)-1], nil
+}
+
+func (repo *Repository) CreateTag(tagName, idStr string) error {
+ _, stderr, err := com.ExecCmdDir(repo.Path, "git", "tag", tagName, idStr)
+ if err != nil {
+ return errors.New(stderr)
+ }
+ return nil
+}
+
+func (repo *Repository) getTag(id sha1) (*Tag, error) {
+ if repo.tagCache != nil {
+ if t, ok := repo.tagCache[id]; ok {
+ return t, nil
+ }
+ } else {
+ repo.tagCache = make(map[sha1]*Tag, 10)
+ }
+
+ // Get tag type.
+ tp, stderr, err := com.ExecCmdDir(repo.Path, "git", "cat-file", "-t", id.String())
+ if err != nil {
+ return nil, errors.New(stderr)
+ }
+
+ // Tag is a commit.
+ if ObjectType(tp) == COMMIT {
+ tag := &Tag{
+ Id: id,
+ Object: id,
+ Type: string(COMMIT),
+ repo: repo,
+ }
+ repo.tagCache[id] = tag
+ return tag, nil
+ }
+
+ // Tag with message.
+ data, bytErr, err := com.ExecCmdDirBytes(repo.Path, "git", "cat-file", "-p", id.String())
+ if err != nil {
+ return nil, errors.New(string(bytErr))
+ }
+
+ tag, err := parseTagData(data)
+ if err != nil {
+ return nil, err
+ }
+
+ tag.Id = id
+ tag.repo = repo
+
+ repo.tagCache[id] = tag
+ return tag, nil
+}
+
+// GetTag returns a Git tag by given name.
+func (repo *Repository) GetTag(tagName string) (*Tag, error) {
+ stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "show-ref", "--tags", tagName)
+ if err != nil {
+ return nil, errors.New(stderr)
+ }
+
+ id, err := NewIdFromString(strings.Split(stdout, " ")[0])
+ if err != nil {
+ return nil, err
+ }
+
+ tag, err := repo.getTag(id)
+ if err != nil {
+ return nil, err
+ }
+ tag.Name = tagName
+ return tag, nil
+}
diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go
new file mode 100644
index 0000000000..da394c3605
--- /dev/null
+++ b/modules/git/repo_tree.go
@@ -0,0 +1,32 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "fmt"
+
+ "github.com/Unknwon/com"
+)
+
+// Find the tree object in the repository.
+func (repo *Repository) GetTree(idStr string) (*Tree, error) {
+ id, err := NewIdFromString(idStr)
+ if err != nil {
+ return nil, err
+ }
+ return repo.getTree(id)
+}
+
+func (repo *Repository) getTree(id sha1) (*Tree, error) {
+ treePath := filepathFromSHA1(repo.Path, id.String())
+ if !com.IsFile(treePath) {
+ _, _, err := com.ExecCmdDir(repo.Path, "git", "ls-tree", id.String())
+ if err != nil {
+ return nil, fmt.Errorf("repo.getTree: %v", ErrNotExist)
+ }
+ }
+
+ return NewTree(repo, id), nil
+}
diff --git a/modules/git/sha1.go b/modules/git/sha1.go
new file mode 100644
index 0000000000..5c57e89b6a
--- /dev/null
+++ b/modules/git/sha1.go
@@ -0,0 +1,87 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "encoding/hex"
+ "errors"
+ "fmt"
+ "strings"
+)
+
+var (
+ IdNotExist = errors.New("sha1 id not exist")
+)
+
+type sha1 [20]byte
+
+// Return true if s has the same sha1 as caller.
+// Support 40-length-string, []byte, sha1
+func (id sha1) Equal(s2 interface{}) bool {
+ switch v := s2.(type) {
+ case string:
+ if len(v) != 40 {
+ return false
+ }
+ return v == id.String()
+ case []byte:
+ if len(v) != 20 {
+ return false
+ }
+ for i, v := range v {
+ if id[i] != v {
+ return false
+ }
+ }
+ case sha1:
+ for i, v := range v {
+ if id[i] != v {
+ return false
+ }
+ }
+ default:
+ return false
+ }
+ return true
+}
+
+// Return string (hex) representation of the Oid
+func (s sha1) String() string {
+ result := make([]byte, 0, 40)
+ hexvalues := []byte("0123456789abcdef")
+ for i := 0; i < 20; i++ {
+ result = append(result, hexvalues[s[i]>>4])
+ result = append(result, hexvalues[s[i]&0xf])
+ }
+ return string(result)
+}
+
+// Create a new sha1 from a 20 byte slice.
+func NewId(b []byte) (sha1, error) {
+ var id sha1
+ if len(b) != 20 {
+ return id, errors.New("Length must be 20")
+ }
+
+ for i := 0; i < 20; i++ {
+ id[i] = b[i]
+ }
+ return id, nil
+}
+
+// Create a new sha1 from a Sha1 string of length 40.
+func NewIdFromString(s string) (sha1, error) {
+ s = strings.TrimSpace(s)
+ var id sha1
+ if len(s) != 40 {
+ return id, fmt.Errorf("Length must be 40")
+ }
+ b, err := hex.DecodeString(s)
+ if err != nil {
+ return id, err
+ }
+
+ return NewId(b)
+}
diff --git a/modules/git/signature.go b/modules/git/signature.go
new file mode 100644
index 0000000000..20f647d266
--- /dev/null
+++ b/modules/git/signature.go
@@ -0,0 +1,40 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+ "bytes"
+ "strconv"
+ "time"
+)
+
+// Author and Committer information
+type Signature struct {
+ Email string
+ Name string
+ When time.Time
+}
+
+// Helper to get a signature from the commit line, which looks like this:
+// author Patrick Gundlach None yet
"); + } } else { $(item).prepend(''); $(item).removeClass("no-checked"); $(item).addClass("checked"); + + $("p:not([class])", $labels).remove(); var $l = $(""); var c = $("span.color", item).css("background-color"); diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css new file mode 100644 index 0000000000..96cf77a639 --- /dev/null +++ b/public/ng/css/gogs.css @@ -0,0 +1,1261 @@ +html, +body { + height: 100%; +} +.octicon, +.fa { + width: 16px; + text-align: center; +} +.fa { + font-size: 14px; +} +.container { + max-width: 1170px; + padding: 0 1.5em; + margin: auto; +} +img.avatar-16 { + width: 16px; + height: 16px; + vertical-align: middle; +} +img.avatar-24 { + width: 24px; + height: 24px; + vertical-align: middle; +} +img.avatar-30 { + width: 30px; + height: 30px; + vertical-align: middle; +} +#wrapper { + padding: 0; + margin: 0 0 -55px 0; + min-height: 100%; +} +#footer { + background-color: white; + border-top: 1px solid #d6d6d6; + clear: both; + width: 100%; + color: #888888; +} +#footer .container { + padding: 15px; +} +#footer .official, +#footer .version { + color: #888888; +} +#footer-links > * { + border-left: 1px solid #d6d6d6; + padding-left: 8px; + margin-left: 5px; +} +#footer-links > *:first-child { + border-left: none; +} +#footer-lang { + position: relative; +} +#footer-lang .drop-down { + top: -64px; + left: -2px; + position: absolute; + height: 59px; + z-index: 100; + font-size: 12px; + width: 120%; +} +#footer-lang .drop-down li > a { + padding: 3px 9px; +} +#header { + background-color: #428bca; + height: 44px; +} +#header > .menu-line > li > a { + display: inline-block; + color: #ffffff; +} +#header > .menu-line > li > a:hover { + background-color: transparent; + color: #fff65f; +} +#header > .menu-line > li.head { + color: #ffffff; +} +#header > .menu-line > li.hover a:after { + bottom: -9px; + color: #ffffff; +} +#header > .menu-line > li.current > a { + color: #fff65f; + font-weight: bold; +} +#header-nav-user { + height: 44px; +} +#header-nav-user img { + margin: -4px 10px 0 0; + border-radius: 3px; +} +#header-nav-sign-out > a:hover { + color: #ff908b !important; +} +#header-nav-logo { + padding: 6px 1.2em; +} +#header-nav-explore, +#header-nav-help { + font-size: 14px; +} +#header-new-repo-menu { + width: 180px; + background-color: #FFF; + top: 44px; + border-top: none; + left: -66px; +} +#header-new-repo-menu .octicon { + margin-right: 6px; + font-size: 1.1em; +} +.switching-list { + width: 100%; + list-style: none; +} +.switching-list > li { + border-bottom: 1px solid #eaeaea; +} +.switching-list > li:last-child { + border-bottom: none; +} +.switching-list > li > a { + padding: .4em 1.2em; + display: block; + color: #444; +} +.switching-list > li > a:hover { + background-color: #428bca !important; + color: #fff !important; +} +.social-buttons .btn { + border: none; + font-size: 16px; + border-radius: 4px; + margin-right: 12px; + font-family: 'PT Sans Narrow', sans-serif; + padding: 5px 12px; + color: #FFF; +} +.social-buttons .btn .fa { + margin-right: 6px; + font-size: 16px; +} +.social-buttons .twitter { + background-color: #1c6399; +} +.social-buttons .twitter:hover { + background-color: #1c5487; +} +.social-buttons .github { + background-color: #444; +} +.social-buttons .github:hover { + background-color: #333; +} +.social-buttons .google { + background-color: #C03D20; +} +.social-buttons .google:hover { + background-color: #D56060; +} +.social-buttons .weibo { + background-color: #bf1324; +} +.social-buttons .weibo:hover { + background-color: #b94c4a; +} +.social-buttons .qq { + background-color: #03a2ef; +} +.social-buttons .qq:hover { + background-color: #3cb3ff; +} +.main-wrapper { + padding: 20px 0 40px; +} +.markdown { + background-color: white; + font-size: 14px; + line-height: 24px; +} +.markdown .markdown-body { + padding-left: 24px; + padding-right: 16px; +} +.markdown a { + color: #428BCA; +} +.markdown h1, +.markdown h2, +.markdown h3, +.markdown h4, +.markdown h5, +.markdown h6 { + line-height: 1.7; + padding: 15px 0 0; + margin: 0 0 15px; + color: #444; + font-weight: bold; +} +.markdown h1, +.markdown h2 { + border-bottom: 1px solid #E0E0E0; +} +.markdown h2 { + border-bottom: 1px solid #E0E0E0; +} +.markdown h1 { + color: #000; + font-size: 33px; +} +.markdown h2 { + color: #333; + font-size: 28px; +} +.markdown h3 { + font-size: 22px; +} +.markdown h4 { + font-size: 18px; +} +.markdown h5 { + font-size: 14px; +} +.markdown h6 { + font-size: 14px; +} +.markdown table { + border-collapse: collapse; + border-spacing: 0; + display: block; + overflow: auto; + width: 100%; + margin: 0 0 9px; +} +.markdown table th { + font-weight: 700; +} +.markdown table th, +.markdown table td { + border: 1px solid #DDD; + padding: 6px 13px; +} +.markdown table tr { + background-color: #FFF; + border-top: 1px solid #CCC; +} +.markdown table tr:nth-child(2n) { + background-color: #f8f8f8; +} +.markdown ul li { + list-style: inside; +} +.markdown li { + line-height: 1.6; + margin-top: 6px; +} +.markdown li:first-child { + margin-top: 0; +} +.markdown dl dt { + font-style: italic; + margin-top: 9px; +} +.markdown dl dd { + margin: 0 0 9px; + padding: 0 9px; +} +.markdown blockquote, +.markdown blockquote p { + font-size: 14px; + background-color: #f5f5f5; +} +.markdown > pre { + line-height: 1.6; + overflow: auto; + border: 1px solid #ddd; + border-radius: .25em; + margin: 5px 0; +} +.markdown > pre.linenums { + padding: 0; +} +.markdown > pre > ol.linenums { + list-style: none; + padding: 0; +} +.markdown > pre > ol.linenums > li { + margin-top: 2px; +} +.markdown > pre.nums-style > ol.linenums { + list-style-type: decimal; + padding: 0 0 0 40px; + -webkit-box-shadow: inset 40px 0 0 #f5f5f5, inset 41px 0 0 #ccc; + box-shadow: inset 40px 0 0 #f5f5f5, inset 41px 0 0 #ccc; +} +.markdown > pre > code { + white-space: pre; + word-wrap: normal; +} +.markdown > pre > ol.linenums > li { + padding: 0 10px; +} +.markdown > pre > ol.linenums > li:first-child { + padding-top: 12px; +} +.markdown > pre > ol.linenums > li:last-child { + padding-bottom: 12px; +} +.markdown > pre.nums-style > ol.linenums > li { + border-left: 1px solid #ddd; +} +.markdown hr { + border: none; + color: #ccc; + height: 4px; + padding: 0; + margin: 15px 0; + border-bottom: 2px solid #EEE; +} +.markdown blockquote:last-child, +.markdown ul:last-child, +.markdown ol:last-child, +.markdown > pre:last-child, +.markdown > pre:last-child, +.markdown p:last-child { + margin-bottom: 0; +} +.markdown img { + max-width: 100%; +} +.markdown .btn { + color: #fff; +} +.markdown .anchor-wrap { + /*margin-top: -50px;*/ + /*padding-top: 50px;*/ +} +.markdown h1 a, +.markdown h2 a, +.markdown h3 a { + text-decoration: none; +} +.markdown h1 a.anchor, +.markdown h2 a.anchor, +.markdown h3 a.anchor, +.markdown h4 a.anchor, +.markdown h5 a.anchor, +.markdown h6 a.anchor { + text-decoration: none; + line-height: 1; + padding-left: 0; + margin-left: -24px; + top: 15%; +} +.markdown a span.octicon { + font-size: 16px; + line-height: 1; + display: inline-block; + text-decoration: none; + -webkit-font-smoothing: antialiased; + margin-left: 30px; +} +.markdown a span.octicon-link { + opacity: 0; + color: #444; +} +.markdown h1:hover .octicon-link, +.markdown h2:hover .octicon-link, +.markdown h3:hover .octicon-link, +.markdown h4:hover .octicon-link, +.markdown h5:hover .octicon-link, +.markdown h6:hover .octicon-link { + display: inline-block; + opacity: 1; +} +/* Author: jmblog */ +/* Project: https://github.com/jmblog/color-themes-for-google-code-prettify */ +/* GitHub Theme */ +/* Pretty printing styles. Used with prettify.js. */ +/* SPAN elements with the classes below are added by prettyprint. */ +/* plain text */ +.pln { + color: #333333; +} +@media screen { + /* string content */ + .str { + color: #dd1144; + } + /* a keyword */ + .kwd { + color: #333333; + } + /* a comment */ + .com { + color: #999988; + font-style: italic; + } + /* a type name */ + .typ { + color: #445588; + } + /* a literal value */ + .lit { + color: #445588; + } + /* punctuation */ + .pun { + color: #333333; + } + /* lisp open bracket */ + .opn { + color: #333333; + } + /* lisp close bracket */ + .clo { + color: #333333; + } + /* a markup tag name */ + .tag { + color: navy; + } + /* a markup attribute name */ + .atn { + color: teal; + } + /* a markup attribute value */ + .atv { + color: #dd1144; + } + /* a declaration */ + .dec { + color: #333333; + } + /* a variable name */ + .var { + color: teal; + } + /* a function name */ + .fun { + color: #990000; + } +} +/* Use higher contrast and text-weight for printable form. */ +@media print, projection { + .str { + color: #006600; + } + .kwd { + color: #006; + font-weight: bold; + } + .com { + color: #600; + font-style: italic; + } + .typ { + color: #404; + font-weight: bold; + } + .lit { + color: #004444; + } + .pun, + .opn, + .clo { + color: #444400; + } + .tag { + color: #006; + font-weight: bold; + } + .atn { + color: #440044; + } + .atv { + color: #006600; + } +} +/* Specify class=linenums on a pre to get line numbering */ +ol.linenums { + margin-top: 0; + margin-bottom: 0; +} +#promo-wrapper { + padding-top: 50px; + background-color: #428bca; +} +#promo-logo { + margin-right: 50px; + padding-bottom: 50px; +} +#promo-logo img { + max-width: 250px; +} +#promo-content { + color: #FFF; + margin-left: 300px; +} +#promo-content h1, +#promo-content h2 { + font-family: 'PT Sans Narrow', sans-serif; + line-height: 60px; + margin-bottom: 0; + text-shadow: 0 2px 1px rgba(0, 0, 0, 0.5); +} +#promo-content h1 { + font-size: 96px; + line-height: 96px; + margin-bottom: 30px; +} +#promo-content h2 { + font-size: 52px; + line-height: 70px; + font-weight: normal; +} +#promo-form { + padding: 40px 0; +} +#promo-form .ipt-large { + border: none; + border-radius: 4px; + font-size: 18px; + margin-right: 12px; +} +#promo-form .ipt-large:focus { + box-shadow: 0 0 3px #FFF; +} +#promo-form .btn-large { + border-radius: 4px; + font-size: 18px; + margin-right: 12px; +} +#promo-social { + padding-bottom: 60px; +} +#promo-social .qq { + box-shadow: 0 0 1px #1c6399; +} +#feature-wrapper { + font-family: Lato, sans-serif; + font-size: 18px; + padding: 50px 0 100px 0; +} +#feature-wrapper .octicon { + color: #d9453d; + font-size: 60px; + height: 60px; + width: 60px; + line-height: 60px; + margin-right: 12px; + vertical-align: middle; + display: inline-block; +} +#feature-wrapper b { + color: #000; + font-size: 24px; + display: inline-block; + line-height: 60px; +} +#feature-wrapper p { + margin: 1em 0; + line-height: 40px; + padding-right: 30px; +} +#feature-wrapper a { + color: #d9453d; +} +#feature-wrapper a:hover { + color: #ff635a; +} +#feature-wrapper .grid-1-2 { + margin-bottom: 30px; +} +/* +The dashboard page style +*/ +#dashboard-header { + border-bottom: 1px solid #d6d6d6; + height: 69px; +} +#dashboard-header > .menu-line > li { + padding: 12px 0; +} +#dashboard-header > .menu-line > li.right > a { + font-size: 1.2em; + color: #444444; +} +#dashboard-header > .menu-line > li.right > a:hover { + background-color: transparent; + color: #d9453d; +} +#dashboard-header > .menu-line > li.right > a .octicon { + margin-right: 6px; +} +#dashboard-header > .menu-line > li.right .current { + border-bottom: 2px solid #D26911; +} +#dashboard-selection-menu a img { + margin: -4px 10px 0 0; +} +#dashboard { + padding: 24px 0; +} +#dashboard-sidebar .panel-header h4 { + margin: 0; +} +#dashboard-sidebar > .panel { + margin-bottom: 24px; + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +#dashboard-sidebar-menu { + border-top-left-radius: .3em; + border-top-right-radius: .3em; + width: 100%; + height: 35px; +} +#dashboard-sidebar-menu > li { + border: 1px solid #d6d6d6; + float: left; + margin-right: -1px; + border-bottom: none; +} +#dashboard-sidebar-menu > li > a { + padding-top: .4em; + padding-bottom: .4em; +} +#dashboard-sidebar-menu > li.first { + border-top-left-radius: .3em; +} +#dashboard-sidebar-menu > li.first > a { + border-top-left-radius: .3em; +} +#dashboard-sidebar-menu > li.drop { + border: none; + float: right; +} +#dashboard-sidebar-menu > li.js-tab-nav-show { + background-color: #EEEEEE; +} +#dashboard-sidebar-menu > li.last { + border-top-right-radius: .3em; +} +#dashboard-sidebar-menu > li.last > a { + border-top-right-radius: .3em; +} +#dashboard-my-repo li { + border-bottom: 1px solid #EAEAEA; +} +#dashboard-my-repo li.private { + background-color: #fcf8e9; +} +#dashboard-my-repo li:last-child { + border-bottom: none; +} +#dashboard-my-repo li a { + padding: 6px 1.2em; + display: block; +} +#dashboard-my-repo li a .octicon { + margin-right: 6px; + color: #888; +} +#dashboard-my-repo li a:hover .repo-name { + text-decoration: underline; +} +#dashboard-my-repo .repo-name { + font-size: 1.1em; +} +#dashboard-my-repo .repo-star { + color: #888; +} +#dashboard-my-repo .repo-contrib-header { + border-top: 1px solid #d6d6d6; +} +#dashboard-my-repo .panel-header .octicon { + margin-right: 6px; + font-size: 12px; +} +#dashboard-my-repo .repo-count { + margin-left: 4px; +} +#dashboard-my-org, +#dashboard-my-mirror { + display: none; +} +#dashboard-new-repo { + width: 50px; + height: 35px; + padding-top: 6px; + margin-right: 1px; + border-top-left-radius: .3em; + border-top-right-radius: .3em; +} +#dashboard-new-repo .octicon { + font-size: 2em; +} +#dashboard-new-repo-menu { + top: 35px; + width: 180px; + background-color: #FFF; + left: -132px; +} +#dashboard-new-repo-menu .octicon { + margin-right: 6px; + font-size: 1.1em; +} +#dashboard-selection-menu > .drop-down { + top: 56px; +} +#dashboard-switch-menu { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +#dashboard-switch-menu > li > a img { + margin-top: 0; +} +#dashboard-switch-menu > li > a .octicon { + margin-right: 12px; +} +#dashboard-switch-menu > li:last-child > a { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +#dashboard-switch-menu > li.org > a .octicon { + opacity: 0; +} +#dashboard-switch-menu > li.checked > a { + font-weight: bold; +} +#dashboard-switch-menu > li.checked > a .octicon { + opacity: 1; +} +#dashboard-news .news { + margin-right: 2.4em; + padding-bottom: 1em; + margin-bottom: 1em; + border-bottom: 1px solid #E6E6E6; + min-height: 30px; +} +#dashboard-news .news .mega-octicon { + color: #CCC; +} +#dashboard-news .news .avatar { + margin: 0 1.2em; +} +#dashboard-news .news .news-content, +#dashboard-news .news .news-time { + color: #888; +} +#dashboard-news .push-news .news-content li { + margin-left: 1em; +} +#dashboard-news .push-news .news-content li img { + margin-bottom: -2px; +} +/* +The register and sign-in page style +*/ +#sign-wrapper { + padding: 60px 0; +} +.sign-panel { + background-color: #ffffff; +} +.sign-form.form-align .field { + margin: 1.2em 0 2em 0; +} +.sign-form.form-align .ipt-large { + width: 300px; +} +.sign-form.form-align label, +.sign-form.form-align .form-label { + width: 160px; +} +.sign-form.form-align .alert { + margin: 0 30px 24px 30px; +} +.sign-form.form-align:hover { + box-shadow: 0 0 6px #CCC; +} +.sign-form.container { + padding: 0; + width: 600px; + margin-bottom: 80px; +} +#sign-up-form .panel-content { + margin-top: 1.2em; +} +#sign-up-form h2 { + margin: .5em 1em; +} +#sign-social { + position: relative; + margin: 40px 0; +} +#sign-social .or { + position: absolute; + width: 30px; + top: -52px; + left: 50%; + background-color: #FFF; + margin-left: -15px; +} +/* repository main */ +#repo-header { + height: 69px; + border-bottom: 1px solid #d6d6d6; + background-color: #ffffff; +} +#repo-header-name { + line-height: 66px; + color: #888888; + font-size: 1.6em; + font-weight: normal; +} +#repo-header-name i { + margin-right: 12px; + vertical-align: middle; +} +#repo-header-name .divider { + margin: 0 4px; +} +#repo-header-meta { + line-height: 66px; +} +#repo-header-meta li > a { + padding: 0; +} +#repo-header-meta li > a:hover { + background-color: transparent; +} +#repo-header-meta a > .btn { + font-size: 1.05em; + margin-left: 16px; + line-height: 16px; +} +#repo-header-meta a > .btn i { + margin-right: 6px; +} +#repo-header-meta a > .btn .num { + margin-left: 6px; +} +#repo-header-download-btn > .btn > i { + margin-right: 0 !important; +} +#repo-header-download-btn:hover:after, +#repo-header-download-btn:hover .btn { + background-color: #383838; + color: #FFF; +} +#repo-header-download-btn:after { + background-color: #444444; + padding: 9px 16px 8px 0; + margin-left: -8px !important; + color: #FFF; + border-top: 1px solid #444444; + border-bottom: 1px solid #444444; + border-top-right-radius: .25em; + border-bottom-right-radius: .25em; +} +#repo-header-download-drop { + line-height: 24px; + width: 440px; + top: 50px; + left: -354px; + padding: 20px; + box-sizing: border-box; +} +#repo-header-download-drop .btn > i { + margin-right: 6px; +} +#repo-content { + padding: 18px 0; +} +#repo-clone-url { + border-right: none; + width: 196px; + border-left: none; +} +#repo-clone-help { + line-height: 48px; +} +#repo-clone-zip { + line-height: 48px; +} +#repo-clone-zip a { + cursor: pointer; + color: white; + overflow: visible; + padding: .6em 1.2em; +} +#repo-clone-zip .btn { + margin: 0 6px; +} +#repo-desc { + font-size: 1.2em; +} +#repo-sidebar-nav .label { + font-size: 12px; + line-height: 1.4em; + margin-top: 2px; +} +#repo-sidebar-nav i { + margin-right: 6px; +} +#repo-file-nav { + padding: .6em 0 1em 0; +} +#repo-file-nav > li > a { + padding-left: 0; +} +#repo-file-nav > li > a:hover { + background-color: transparent; +} +#repo-file-nav li.repo-jump > a { + padding-right: 0; +} +#repo-file-nav li.repo-jump > a .btn { + margin-left: -1px; +} +#repo-branch-switch > a .btn { + padding-right: 30px; +} +#repo-branch-switch > a:after { + position: absolute; + top: 12px; + right: 30px; + margin-left: 0; + color: #444444; +} +#repo-branch-switch > .drop-down { + top: 40px; + left: 0; +} +#repo-branch-filter-ipt { + width: 100%; + border-left: none; + border-right: none; + box-sizing: border-box; +} +#repo-branch-tag .tab-nav { + border-bottom: 1px solid #EAEAEA; +} +#repo-branch-tag .tab-nav a { + padding: .3em .8em; +} +#repo-branch-tag .tab-nav .js-tab-nav-show { + background-color: #EEE; + font-weight: bold; +} +#repo-branch-list li i, +#repo-tag-list li i { + margin-right: 12px; + opacity: 0; +} +#repo-branch-list li.checked i, +#repo-tag-list li.checked i { + opacity: 1; +} +#repo-tag-list { + display: none; +} +#repo-bread .bread { + padding-right: 0; + font-size: 16px; + font-weight: bold; +} +#repo-main { + padding-right: 40px; + box-sizing: border-box; +} +#repo-files-table { + margin-bottom: 20px; +} +#repo-files-table th, +#repo-files-table td { + text-align: left; + line-height: 32px; +} +#repo-files-table td.icon { + width: 16px; + padding-right: .1em; + padding-left: 1em; +} +#repo-files-table td.name { + max-width: 120px; +} +#repo-files-table td.name .text-truncate { + max-width: 100%; +} +#repo-files-table td.age { + max-width: 120px; + text-align: right; +} +#repo-files-table td.msg { + max-width: 440px; +} +#repo-files-table td.msg .text-truncate { + max-width: 100%; +} +#repo-files-table td.age, +#repo-files-table td.size, +#repo-files-table td.msg a { + color: #888; +} +#repo-files-table td.msg a:hover { + color: #428BCA; + text-decoration: underline; +} +#repo-files-table tbody { + background-color: #FFF; +} +#repo-files-table tbody tr:hover { + background-color: #ffffEE; +} +#repo-files-table thead { + background-color: #F0F0F0; +} +#repo-files-table thead .author a { + margin: 0 .4em; +} +#repo-files-table thead .last-commit strong { + color: #444; +} +#repo-files-table thead .last-commit .text-truncate { + margin-left: .4em; +} +#repo-files-table thead .last-commit .text-truncate, +#repo-files-table thead .age { + font-weight: normal; + color: #888; +} +#repo-readme { + margin-bottom: 80px; +} +#repo-bare-start { + margin-bottom: 100px; +} +#repo-bare-start .panel-content { + background-color: #FFF; +} +#repo-bare-start pre { + margin: 0 40px; + padding: 6px 10px; + border: 1px solid #ddd; + background: #f8f8f8; +} +.repo-bare #repo-bare-start h2 { + margin-top: 30px; + margin-bottom: 24px; +} +.repo-bare #repo-header-meta { + display: none; +} +.repo-bare #repo-clone-ssh { + margin-left: 200px; +} +.repo-bare #repo-clone-copy { + margin-right: 200px; +} +.repo-bare #repo-clone-help { + clear: both; + width: 100%; +} +.repo-bare #repo-clone-url { + width: 520px; +} +/* repository create */ +#repo-create-form { + width: 800px; + margin: 60px auto 150px auto; + background: white; +} +#repo-create-form h2 { + margin: .5em 1em; +} +#repo-create-form .field { + margin: 1.2em 0 2em 0; +} +#repo-create-form .ipt { + width: 540px; +} +#repo-create-form textarea { + height: 120px; +} +#repo-create-form .avatar { + vertical-align: middle; + margin-right: .6em; + width: 28px; + height: 28px; +} +#repo-create-form:hover { + box-shadow: 0px 0px 6px #CCC; +} +#repo-create-cancel { + margin-left: 4em; +} +#repo-create-owner-list { + top: 30px; + left: 0; +} +#repo-create-owner-list .octicon { + margin-right: 12px; + opacity: 0; +} +#repo-create-owner-list .avatar { + width: 20px; + height: 20px; +} +#repo-create-owner-list li.checked .octicon { + opacity: 1; +} +.file-name { + margin-left: 1em; +} +.file-size { + font-size: 13px; + color: #888; + margin-left: 1em; +} +.code-view { + overflow: auto; + overflow-x: auto; + overflow-y: hidden; +} +.code-view table { + width: 100%; +} +.code-view table td { + padding: 0; +} +.code-view .lines-num { + text-align: right; + color: #999; + background: #f5f5f5; + width: 1%; +} +.code-view .lines-num span { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + line-height: 18px; + padding: 0 8px 0 10px; + cursor: pointer; + display: block; + margin-top: 2px; + font-size: 12px; +} +.code-view .lines-code > pre { + border: none; + background: none; + border-left: 1px solid #ddd; +} +.code-view .lines-code > pre > ol.linenums > li { + padding: 0 10px; +} +.code-view .lines-code > pre > ol.linenums > li.active { + background: #ffffdd; +} +#setting-wrapper { + padding-bottom: 100px; +} +#setting-menu { + box-sizing: border-box; +} +#setting-menu li > a { + border-left: 2px solid #FFF; + background-color: #FFF; +} +#setting-menu li:hover { + border-color: #EAEAEA; +} +#setting-menu li:hover a { + border-left: 2px solid #EFEFEF; + background-color: #EFEFEF !important; + color: #000 !important; +} +#setting-menu li.current a { + color: #000 !important; + font-weight: bold; + border-left: 2px solid #d26911; +} +.setting-content { + margin-left: 32px; +} +#user-profile-form { + background-color: #FFF; + padding: 30px 0; +} +#user-profile-form label, +#user-profile-form .form-label { + width: 240px; +} +#user-profile-form .ipt { + width: 360px; +} +#user-profile-form .field { + margin-bottom: 24px; +} +#user-ssh-panel { + margin-bottom: 20px; +} +#user-ssh-panel .switching-list { + background-color: #FFF; +} +#user-ssh-panel .switching-list li { + padding: 8px 20px; +} +#user-ssh-panel .switching-list li.ssh:hover { + background-color: #ffffEE; +} +#user-ssh-panel .active-icon { + width: 10px; + height: 10px; + border-radius: 6px; + padding: 0; + margin-right: 20px; + margin-top: 10px; +} +#user-ssh-panel .ssh-content { + margin-left: 24px; +} +#user-ssh-panel .ssh-content .octicon { + margin-right: 4px; +} +#user-ssh-panel .ssh-content .print, +#user-ssh-panel .ssh-content .activity { + color: #888; +} +#user-ssh-panel .ssh-delete-btn { + margin-top: 6px; +} +#user-ssh-add-form .panel-body { + background-color: #FFF; + padding: 30px 0; +} +#user-ssh-add-form .ipt { + width: 500px; +} +#user-ssh-add-form textarea { + height: 120px; + margin-left: 3px; +} +#user-ssh-add-form .field { + margin-bottom: 24px; +} diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css new file mode 100644 index 0000000000..f32261234f --- /dev/null +++ b/public/ng/css/ui.css @@ -0,0 +1,814 @@ +* { + padding: 0; + margin: 0; +} +html { + font-size: 13px; + font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + line-height: 24px; + color: #444444; + background-color: #fafafa; +} +input, +textarea, +select, +option, +button { + font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +main, +nav, +section, +summary, +.block { + display: block; +} +.inline { + display: inline; +} +.inline-block { + display: inline-block; +} +.dis-table { + display: table; +} +.dis-table-cell { + display: table-cell; +} +.dis-flex { + display: flex; +} +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} +audio:not([controls]) { + display: none; + height: 0; +} +[hidden], +template .hidden { + display: none; +} +.opacity { + opacity: 0; +} +.opacity-half { + opacity: .5; +} +a, +.text-link { + color: #428bca; + text-decoration: none; +} +a:hover, +.text-link:hover { + color: #399ade; + text-decoration: none; +} +a:focus, +.text-link:focus { + outline: none; +} +b, +strong, +.text-bold { + font-weight: bold; +} +dfn, +.text-italic { + font-style: italic; +} +h1, +.text-h1 { + font-size: 2em; + margin-bottom: 0.67em; +} +h2, +.text-h2 { + font-size: 1.6em; + margin-bottom: 0.625em; +} +h3, +.text-h3 { + font: 1.2em; + margin-bottom: 0.5em; +} +h4, +h5, +h6, +.text-h4, +.text-h5, +.text-h6 { + font-size: 1em; + margin-bottom: .3em; +} +small, +.text-small { + font-size: .8em; +} +sub, +sup, +.text-sup, +.text-sub { + font-size: .7em; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup, +.text-sup { + top: -0.5em; +} +sub, +.text-sub { + bottom: -0.25em; +} +.figure, +.blockquote { + margin: 1em 1.5em; +} +pre { + overflow: auto; + margin: 0; + padding: .4em 1em; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.list-no-style { + list-style: none; +} +img { + border: none; +} +svg:not(:root) { + overflow: hidden; +} +label { + font-weight: bold; +} +input, +.ipt { + padding: .6em; + line-height: normal; + border: 1px solid #bbbbbb; +} +input:focus, +.ipt:focus { + background-color: #f2fffc; + outline: none; +} +button { + overflow: visible; + padding: .6em 1.2em; +} +button, +select { + text-transform: none; +} +button:focus, +select:focus { + outline: none; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + -moz-appearance: button; + cursor: pointer; + background-color: #888888; + color: #fafafa; + border: none; +} +button:hover, +input[type="button"]:hover, +input[type="reset"]:hover, +input[type="submit"]:hover { + background-color: #444444; + color: #ffffff; +} +button[disabled], +html input[disabled] { + cursor: default; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +input[type="search"] { + -webkit-appearance: textfield; + -moz-appearance: textfield; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; +} +fieldset { + border: 1px solid #bbbbbb; + margin: 0 2px; + padding: 0.4em 0.8em 0.8em; +} +legend { + border: 0; + padding: 0; +} +textarea { + overflow: auto; + border: 1px solid #bbbbbb; + padding: .6em; +} +textarea:focus { + background-color: #f2fffc; + outline: none; +} +optgroup { + font-weight: bold; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +td, +th { + padding: 0; +} +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; + border: none; + border-bottom: 1px solid #dddddd; + margin-bottom: .75em; +} +p code { + color: #b63b2c; +} +.radius { + border-radius: .25em; +} +.text-truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: inline-block; + vertical-align: top; +} +pre { + line-height: 1.6; + overflow: auto; + padding: 0; +} +.left { + float: left; +} +.right { + float: right; +} +.clear::after { + clear: both; + content: " "; + width: 0; + height: 0; + display: block; +} +.hide { + display: none; +} +.grid-1-12 { + width: 8.33%; +} +.grid-2-12, +.grid-1-6 { + width: 16.67%; +} +.grid-3-12, +.grid-1-4 { + width: 25%; +} +.grid-4-12, +.grid-1-3 { + width: 33%; +} +.grid-5-12 { + width: 41.67%; +} +.grid-6-12, +.grid-1-2 { + width: 50%; +} +.grid-7-12 { + width: 58.33%; +} +.grid-8-12, +.grid-2-3 { + width: 66.67%; +} +.grid-9-12, +.grid-3-4 { + width: 75%; +} +.grid-10-12, +.grid-5-6 { + width: 83.33%; +} +.grid-11-12 { + width: 91.67%; +} +*[class*="grid-"] { + box-sizing: content-box; +} +.grid-1-5 { + width: 20%; +} +.grid-2-5 { + width: 40%; +} +.grid-3-5 { + width: 60%; +} +.grid-4-5 { + width: 80%; +} +.btn-small { + font-size: 10.8px; + padding: .4em .9em; +} +.btn-large { + font-size: 14.4px; +} +.btn-green { + background-color: #65ad4e; + border: 1px solid #65ad4e; +} +.btn-green:hover { + background-color: #71bf57; + color: #FFF; +} +.btn-blue { + background-color: #428bca; + border: 1px solid #428bca; +} +.btn-blue:hover { + background-color: #539cdb; + color: #FFF; +} +.btn-red { + background-color: #d9453d; + border: 1px solid #d9453d; +} +.btn-red:hover { + background-color: #ff635a; + color: #FFF; +} +.btn-orange { + background-color: #df7514; + border: 1px solid #df7514; +} +.btn-orange:hover { + background-color: #df8229; + color: #FFF; +} +.btn-black { + background-color: #444444; + border: 1px solid #444444; +} +.btn-black:hover { + background-color: #383838; + color: #FFF; +} +.btn-gray { + background-color: #f0f0f0; + color: #444444; + border: 1px solid #d0d0d0; +} +.btn-gray:hover { + background-color: #fafafa; + color: #444444; +} +.btn-active { + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, 0 0 4px rgba(0, 0, 0, 0.15) inset; +} +.btn-radius { + border-radius: .25em; +} +.btn-left-radius { + border-top-left-radius: .25em; + border-bottom-left-radius: .25em; +} +.btn-right-radius { + border-top-right-radius: .25em; + border-bottom-right-radius: .25em; +} +.btn-block { + display: block; + width: 100%; + box-sizing: content-box; + text-align: center; +} +.btn-disabled { + opacity: .6; + cursor: not-allowed; + box-shadow: none; + background-image: none !important; + border: none; +} +.btn-disabled:hover { + background-image: none !important; + color: #ffffff; +} +.ipt:focus { + border-color: #428bca; +} +.ipt-radius { + border-radius: .25em; +} +.ipt-small { + font-size: 9.6px; +} +.ipt-large { + font-size: 14.4px; +} +.ipt-disabled, +input[disabled] { + background-color: #f2f2f2 !important; + color: #888; + cursor: not-allowed; +} +.ipt-disabled:focus, +input[disabled]:focus { + background-color: #f2f2f2 !important; +} +.ipt-readonly:focus, +input[readonly]:focus { + background-color: #f2f2f2 !important; +} +.ipt-error { + border-color: #b63b2c !important; + background-color: #fff0f0 !important; +} +.form label { + margin-right: 1em; +} +.form .help { + color: #999999; + padding-top: .6em; + display: inline-block; +} +.form-stack label { + display: block; +} +.form-stack .field { + margin-bottom: 1em; +} +.form-align label, +.form-align .form-label { + display: inline-block; + width: 120px; + text-align: right; + margin-right: 1em; +} +.form-align .field { + margin-bottom: 1em; +} +label.req:after { + content: "*"; + color: #d9453d; +} +ul.menu > li { + list-style: none; +} +ul.menu > li > a { + padding: .8em 1.2em; +} +ul.menu > li > a:hover { + background-color: #eaeaea; + color: #444444; +} +ul.menu > li.current > a, +ul.menu > li.hover > a { + color: #444444; +} +ul.menu > li.head { + font-weight: bold; + padding: .8em 1.2em; +} +ul.menu > li.down:hover > ul.menu-down { + display: block; +} +ul.menu > li.border-bottom { + border-bottom: 1px solid #bbbbbb; + height: 0; + margin: .5em 0; +} +ul.menu-line > li, +ul.menu-line > li > a { + display: inline-block; +} +ul.menu-line > li.down { + position: relative; +} +ul.menu-line > li.down > a:after { + content: "\25BE"; + margin-left: .4em; +} +ul.menu-line > li.down > ul.menu-down { + top: 2.1em; + width: 150%; +} +ul.menu-line > li.hover { + position: relative; +} +ul.menu-line > li.hover > a:after { + position: absolute; + content: "\25B4"; + left: 50%; + bottom: -1.1em; + margin-left: -4px; +} +ul.menu-vertical > li > a, +ul.menu-down > li > a, +ul.menu-vertical > li.head, +ul.menu-down > li.head { + display: block; + padding: .4em 1.2em; +} +ul.menu-vertical > li.down, +ul.menu-down > li.down { + position: relative; +} +ul.menu-vertical > li.down > a:after, +ul.menu-down > li.down > a:after { + content: "\25B8"; + position: absolute; + right: .6em; +} +ul.menu-vertical > li.hover, +ul.menu-down > li.hover { + position: relative; +} +ul.menu-vertical > li.hover > a:after, +ul.menu-down > li.hover > a:after { + content: "\25B8"; + position: absolute; + left: .5em; +} +ul.menu-border, +ul.menu-down { + border: 1px solid #bbbbbb; +} +ul.menu-border > li.head, +ul.menu-down > li.head { + border-bottom: 1px solid #bbbbbb; +} +ul.menu-down { + position: absolute; + display: none; + z-index: 99; + box-shadow: 0 0 2px #666666; + background-color: #ffffff; +} +ul.menu-radius { + border-radius: .3em; +} +ul.menu-radius > li:first-child { + border-top-left-radius: .3em; + border-top-right-radius: .3em; +} +ul.menu-radius > li:first-child > a { + border-top-left-radius: .2em; + border-top-right-radius: .2em; +} +ul.menu-radius > li:last-child { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +ul.menu-radius > li:last-child > a { + border-bottom-left-radius: .2em; + border-bottom-right-radius: .2em; +} +.drop { + position: relative; +} +.drop:hover > .drop-down { + position: absolute; + top: 0; + left: 0; + width: 200%; + display: block; +} +.drop > .drop-down { + display: none; + border: 1px solid #bbbbbb; + box-shadow: 0 0 3px #666666; + background-color: #ffffff; +} +.drop-bottom:after { + content: "\25BE"; + margin-left: .4em; +} +.drop-top:after { + content: "\25B4"; + margin-left: .4em; +} +.panel { + border: 1px solid #cccccc; +} +.panel .panel-header { + font-size: 16px; + padding: .6em 1.2em; + background-color: #eeeeee; + border-bottom: 1px solid #cccccc; +} +.panel .panel-body .panel-desc { + margin-bottom: 20px; +} +.panel .panel-content { + padding: 1em 1.2em; +} +.panel .panel-footer { + padding: .6em 1.2em; + background-color: #eeeeee; + border-top: 1px solid #cccccc; +} +.panel.panel-radius { + border-radius: .3em; +} +.panel.panel-radius .panel-header { + border-top-left-radius: .3em; + border-top-right-radius: .3em; +} +.panel.panel-radius .panel-footer { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +.panel.panel-warning { + border-color: #F0C36D; +} +.panel.panel-warning > .panel-header { + background-color: #F9EDBE; + border-color: #F0C36D; +} +.label { + padding: 2px 6px; + color: #ffffff; +} +.label-red { + background-color: #d9453d; +} +.label-blue { + background-color: #428bca; +} +.label-gray { + background-color: #999999; +} +.label-green { + background-color: #65ad4e; +} +.label-orange { + background-color: #df7514; +} +.label-black { + background-color: #444444; +} +.label-radius { + border-radius: .2em; +} +.label-link { + color: #ffffff; +} +.label-link:hover { + color: #ffffff; +} +.breads .bread:after { + content: "/"; + font-weight: bold; + margin: 0 4px 0 7px; + color: #444444; +} +.breads .bread:last-child:after { + content: ""; + margin: 0; +} +.alert { + padding: .6em 1.5em; + margin-bottom: 10px; +} +.alert i { + margin-right: 8px; +} +.alert-radius { + border-radius: .25em; +} +.alert-red { + color: #d9453d; + border: 1px solid #be2d25; + background-color: #fae9e8; +} +.alert-blue { + color: #428bca; + border: 1px solid #3071a9; + background-color: #f5f9fc; +} +.alert-green { + color: #65ad4e; + border: 1px solid #508a3e; + background-color: #edf6eb; +} +.alert-gray { + color: #999999; + border: 1px solid #808080; + background-color: #f2f2f2; +} +.alert-orange { + color: #df7514; + border: 1px solid #b05c10; + background-color: #fcecdd; +} +table th, +table td { + padding: .3em .6em; + line-height: 30px; +} +.table-border { + border: 1px solid #d6d6d6; +} +.table-border tr { + border-top: 1px solid #eaeaea; +} +.table-border tr th, +.table-border tr td { + border-top: 1px solid #eaeaea; +} +.table-border tr:first-child { + border-top: none; +} +.table-border thead { + border-bottom: 1px solid #d6d6d6; +} +.table-block { + width: 100%; + box-sizing: border-box; +} +.table-radius { + border-collapse: separate !important; + border-radius: .3em; +} +.table-radius thead:first-child { + border-top-left-radius: .3em; + border-top-right-radius: .3em; +} +.table-radius thead:first-child tr:first-child { + border-top-left-radius: .3em; +} +.table-radius thead:first-child tr:first-child > th:first-child { + border-top-left-radius: .3em; +} +.table-radius thead:first-child tr:first-child > th:last-child { + border-top-right-radius: .3em; +} +.table-radius tbody { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +.table-radius tbody tr:last-child { + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; +} +.table-radius tbody tr:last-child > td:first-child { + border-bottom-left-radius: .3em; +} +.table-radius tbody tr:last-child > td:last-child { + border-bottom-right-radius: .3em; +} diff --git a/public/ng/fonts/FontAwesome.otf b/public/ng/fonts/FontAwesome.otf new file mode 100644 index 0000000000..3461e3fce6 Binary files /dev/null and b/public/ng/fonts/FontAwesome.otf differ diff --git a/public/ng/fonts/fontawesome-webfont.eot b/public/ng/fonts/fontawesome-webfont.eot new file mode 100755 index 0000000000..6cfd566095 Binary files /dev/null and b/public/ng/fonts/fontawesome-webfont.eot differ diff --git a/public/ng/fonts/fontawesome-webfont.svg b/public/ng/fonts/fontawesome-webfont.svg new file mode 100755 index 0000000000..a9f8469503 --- /dev/null +++ b/public/ng/fonts/fontawesome-webfont.svg @@ -0,0 +1,504 @@ + + + \ No newline at end of file diff --git a/public/ng/fonts/fontawesome-webfont.ttf b/public/ng/fonts/fontawesome-webfont.ttf new file mode 100755 index 0000000000..5cd6cff6d6 Binary files /dev/null and b/public/ng/fonts/fontawesome-webfont.ttf differ diff --git a/public/ng/fonts/fontawesome-webfont.woff b/public/ng/fonts/fontawesome-webfont.woff new file mode 100755 index 0000000000..9eaecb3799 Binary files /dev/null and b/public/ng/fonts/fontawesome-webfont.woff differ diff --git a/public/ng/fonts/octicons.css b/public/ng/fonts/octicons.css new file mode 100755 index 0000000000..2d66bd6cf3 --- /dev/null +++ b/public/ng/fonts/octicons.css @@ -0,0 +1,237 @@ +@font-face { + font-family: 'octicons'; + src: url('octicons.eot?#iefix') format('embedded-opentype'), + url('octicons.woff') format('woff'), + url('octicons.ttf') format('truetype'), + url('octicons.svg#octicons') format('svg'); + font-weight: normal; + font-style: normal; +} + +/* + +.octicon is optimized for 16px. +.mega-octicon is optimized for 32px but can be used larger. + +*/ +.octicon { + font: normal normal 16px octicons; + line-height: 1; + display: inline-block; + text-decoration: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +.mega-octicon { + font: normal normal 32px octicons; + line-height: 1; + display: inline-block; + text-decoration: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.octicon-alert:before { content: '\f02d'} /* */ +.octicon-alignment-align:before { content: '\f08a'} /* */ +.octicon-alignment-aligned-to:before { content: '\f08e'} /* */ +.octicon-alignment-unalign:before { content: '\f08b'} /* */ +.octicon-arrow-down:before { content: '\f03f'} /* */ +.octicon-arrow-left:before { content: '\f040'} /* */ +.octicon-arrow-right:before { content: '\f03e'} /* */ +.octicon-arrow-small-down:before { content: '\f0a0'} /* */ +.octicon-arrow-small-left:before { content: '\f0a1'} /* */ +.octicon-arrow-small-right:before { content: '\f071'} /* */ +.octicon-arrow-small-up:before { content: '\f09f'} /* */ +.octicon-arrow-up:before { content: '\f03d'} /* */ +.octicon-beer:before { content: '\f069'} /* */ +.octicon-book:before { content: '\f007'} /* */ +.octicon-bookmark:before { content: '\f07b'} /* */ +.octicon-briefcase:before { content: '\f0d3'} /* */ +.octicon-broadcast:before { content: '\f048'} /* */ +.octicon-browser:before { content: '\f0c5'} /* */ +.octicon-bug:before { content: '\f091'} /* */ +.octicon-calendar:before { content: '\f068'} /* */ +.octicon-check:before { content: '\f03a'} /* */ +.octicon-checklist:before { content: '\f076'} /* */ +.octicon-chevron-down:before { content: '\f0a3'} /* */ +.octicon-chevron-left:before { content: '\f0a4'} /* */ +.octicon-chevron-right:before { content: '\f078'} /* */ +.octicon-chevron-up:before { content: '\f0a2'} /* */ +.octicon-circle-slash:before { content: '\f084'} /* */ +.octicon-circuit-board:before { content: '\f0d6'} /* */ +.octicon-clippy:before { content: '\f035'} /* */ +.octicon-clock:before { content: '\f046'} /* */ +.octicon-cloud-download:before { content: '\f00b'} /* */ +.octicon-cloud-upload:before { content: '\f00c'} /* */ +.octicon-code:before { content: '\f05f'} /* */ +.octicon-color-mode:before { content: '\f065'} /* */ +.octicon-comment-add:before, +.octicon-comment:before { content: '\f02b'} /* */ +.octicon-comment-discussion:before { content: '\f04f'} /* */ +.octicon-credit-card:before { content: '\f045'} /* */ +.octicon-dash:before { content: '\f0ca'} /* */ +.octicon-dashboard:before { content: '\f07d'} /* */ +.octicon-database:before { content: '\f096'} /* */ +.octicon-device-camera:before { content: '\f056'} /* */ +.octicon-device-camera-video:before { content: '\f057'} /* */ +.octicon-device-desktop:before { content: '\f27c'} /* */ +.octicon-device-mobile:before { content: '\f038'} /* */ +.octicon-diff:before { content: '\f04d'} /* */ +.octicon-diff-added:before { content: '\f06b'} /* */ +.octicon-diff-ignored:before { content: '\f099'} /* */ +.octicon-diff-modified:before { content: '\f06d'} /* */ +.octicon-diff-removed:before { content: '\f06c'} /* */ +.octicon-diff-renamed:before { content: '\f06e'} /* */ +.octicon-ellipsis:before { content: '\f09a'} /* */ +.octicon-eye-unwatch:before, +.octicon-eye-watch:before, +.octicon-eye:before { content: '\f04e'} /* */ +.octicon-file-binary:before { content: '\f094'} /* */ +.octicon-file-code:before { content: '\f010'} /* */ +.octicon-file-directory:before { content: '\f016'} /* */ +.octicon-file-media:before { content: '\f012'} /* */ +.octicon-file-pdf:before { content: '\f014'} /* */ +.octicon-file-submodule:before { content: '\f017'} /* */ +.octicon-file-symlink-directory:before { content: '\f0b1'} /* */ +.octicon-file-symlink-file:before { content: '\f0b0'} /* */ +.octicon-file-text:before { content: '\f011'} /* */ +.octicon-file-zip:before { content: '\f013'} /* */ +.octicon-flame:before { content: '\f0d2'} /* */ +.octicon-fold:before { content: '\f0cc'} /* */ +.octicon-gear:before { content: '\f02f'} /* */ +.octicon-gift:before { content: '\f042'} /* */ +.octicon-gist:before { content: '\f00e'} /* */ +.octicon-gist-secret:before { content: '\f08c'} /* */ +.octicon-git-branch-create:before, +.octicon-git-branch-delete:before, +.octicon-git-branch:before { content: '\f020'} /* */ +.octicon-git-commit:before { content: '\f01f'} /* */ +.octicon-git-compare:before { content: '\f0ac'} /* */ +.octicon-git-merge:before { content: '\f023'} /* */ +.octicon-git-pull-request-abandoned:before, +.octicon-git-pull-request:before { content: '\f009'} /* */ +.octicon-globe:before { content: '\f0b6'} /* */ +.octicon-graph:before { content: '\f043'} /* */ +.octicon-heart:before { content: '\2665'} /* ♥ */ +.octicon-history:before { content: '\f07e'} /* */ +.octicon-home:before { content: '\f08d'} /* */ +.octicon-horizontal-rule:before { content: '\f070'} /* */ +.octicon-hourglass:before { content: '\f09e'} /* */ +.octicon-hubot:before { content: '\f09d'} /* */ +.octicon-inbox:before { content: '\f0cf'} /* */ +.octicon-info:before { content: '\f059'} /* */ +.octicon-issue-closed:before { content: '\f028'} /* */ +.octicon-issue-opened:before { content: '\f026'} /* */ +.octicon-issue-reopened:before { content: '\f027'} /* */ +.octicon-jersey:before { content: '\f019'} /* */ +.octicon-jump-down:before { content: '\f072'} /* */ +.octicon-jump-left:before { content: '\f0a5'} /* */ +.octicon-jump-right:before { content: '\f0a6'} /* */ +.octicon-jump-up:before { content: '\f073'} /* */ +.octicon-key:before { content: '\f049'} /* */ +.octicon-keyboard:before { content: '\f00d'} /* */ +.octicon-law:before { content: '\f0d8'} /* */ +.octicon-light-bulb:before { content: '\f000'} /* */ +.octicon-link:before { content: '\f05c'} /* */ +.octicon-link-external:before { content: '\f07f'} /* */ +.octicon-list-ordered:before { content: '\f062'} /* */ +.octicon-list-unordered:before { content: '\f061'} /* */ +.octicon-location:before { content: '\f060'} /* */ +.octicon-gist-private:before, +.octicon-mirror-private:before, +.octicon-git-fork-private:before, +.octicon-lock:before { content: '\f06a'} /* */ +.octicon-logo-github:before { content: '\f092'} /* */ +.octicon-mail:before { content: '\f03b'} /* */ +.octicon-mail-read:before { content: '\f03c'} /* */ +.octicon-mail-reply:before { content: '\f051'} /* */ +.octicon-mark-github:before { content: '\f00a'} /* */ +.octicon-markdown:before { content: '\f0c9'} /* */ +.octicon-megaphone:before { content: '\f077'} /* */ +.octicon-mention:before { content: '\f0be'} /* */ +.octicon-microscope:before { content: '\f089'} /* */ +.octicon-milestone:before { content: '\f075'} /* */ +.octicon-mirror-public:before, +.octicon-mirror:before { content: '\f024'} /* */ +.octicon-mortar-board:before { content: '\f0d7'} /* */ +.octicon-move-down:before { content: '\f0a8'} /* */ +.octicon-move-left:before { content: '\f074'} /* */ +.octicon-move-right:before { content: '\f0a9'} /* */ +.octicon-move-up:before { content: '\f0a7'} /* */ +.octicon-mute:before { content: '\f080'} /* */ +.octicon-no-newline:before { content: '\f09c'} /* */ +.octicon-octoface:before { content: '\f008'} /* */ +.octicon-organization:before { content: '\f037'} /* */ +.octicon-package:before { content: '\f0c4'} /* */ +.octicon-paintcan:before { content: '\f0d1'} /* */ +.octicon-pencil:before { content: '\f058'} /* */ +.octicon-person-add:before, +.octicon-person-follow:before, +.octicon-person:before { content: '\f018'} /* */ +.octicon-pin:before { content: '\f041'} /* */ +.octicon-playback-fast-forward:before { content: '\f0bd'} /* */ +.octicon-playback-pause:before { content: '\f0bb'} /* */ +.octicon-playback-play:before { content: '\f0bf'} /* */ +.octicon-playback-rewind:before { content: '\f0bc'} /* */ +.octicon-plug:before { content: '\f0d4'} /* */ +.octicon-repo-create:before, +.octicon-gist-new:before, +.octicon-file-directory-create:before, +.octicon-file-add:before, +.octicon-plus:before { content: '\f05d'} /* */ +.octicon-podium:before { content: '\f0af'} /* */ +.octicon-primitive-dot:before { content: '\f052'} /* */ +.octicon-primitive-square:before { content: '\f053'} /* */ +.octicon-pulse:before { content: '\f085'} /* */ +.octicon-puzzle:before { content: '\f0c0'} /* */ +.octicon-question:before { content: '\f02c'} /* */ +.octicon-quote:before { content: '\f063'} /* */ +.octicon-radio-tower:before { content: '\f030'} /* */ +.octicon-repo-delete:before, +.octicon-repo:before { content: '\f001'} /* */ +.octicon-repo-clone:before { content: '\f04c'} /* */ +.octicon-repo-force-push:before { content: '\f04a'} /* */ +.octicon-gist-fork:before, +.octicon-repo-forked:before { content: '\f002'} /* */ +.octicon-repo-pull:before { content: '\f006'} /* */ +.octicon-repo-push:before { content: '\f005'} /* */ +.octicon-rocket:before { content: '\f033'} /* */ +.octicon-rss:before { content: '\f034'} /* */ +.octicon-ruby:before { content: '\f047'} /* */ +.octicon-screen-full:before { content: '\f066'} /* */ +.octicon-screen-normal:before { content: '\f067'} /* */ +.octicon-search-save:before, +.octicon-search:before { content: '\f02e'} /* */ +.octicon-server:before { content: '\f097'} /* */ +.octicon-settings:before { content: '\f07c'} /* */ +.octicon-log-in:before, +.octicon-sign-in:before { content: '\f036'} /* */ +.octicon-log-out:before, +.octicon-sign-out:before { content: '\f032'} /* */ +.octicon-split:before { content: '\f0c6'} /* */ +.octicon-squirrel:before { content: '\f0b2'} /* */ +.octicon-star-add:before, +.octicon-star-delete:before, +.octicon-star:before { content: '\f02a'} /* */ +.octicon-steps:before { content: '\f0c7'} /* */ +.octicon-stop:before { content: '\f08f'} /* */ +.octicon-repo-sync:before, +.octicon-sync:before { content: '\f087'} /* */ +.octicon-tag-remove:before, +.octicon-tag-add:before, +.octicon-tag:before { content: '\f015'} /* */ +.octicon-telescope:before { content: '\f088'} /* */ +.octicon-terminal:before { content: '\f0c8'} /* */ +.octicon-three-bars:before { content: '\f05e'} /* */ +.octicon-tools:before { content: '\f031'} /* */ +.octicon-trashcan:before { content: '\f0d0'} /* */ +.octicon-triangle-down:before { content: '\f05b'} /* */ +.octicon-triangle-left:before { content: '\f044'} /* */ +.octicon-triangle-right:before { content: '\f05a'} /* */ +.octicon-triangle-up:before { content: '\f0aa'} /* */ +.octicon-unfold:before { content: '\f039'} /* */ +.octicon-unmute:before { content: '\f0ba'} /* */ +.octicon-versions:before { content: '\f064'} /* */ +.octicon-remove-close:before, +.octicon-x:before { content: '\f081'} /* */ +.octicon-zap:before { content: '\26A1'} /* ⚡ */ diff --git a/public/ng/fonts/octicons.eot b/public/ng/fonts/octicons.eot new file mode 100755 index 0000000000..e4edc6e56d Binary files /dev/null and b/public/ng/fonts/octicons.eot differ diff --git a/public/ng/fonts/octicons.svg b/public/ng/fonts/octicons.svg new file mode 100755 index 0000000000..ea3e0f1615 --- /dev/null +++ b/public/ng/fonts/octicons.svg @@ -0,0 +1,198 @@ + + + diff --git a/public/ng/fonts/octicons.ttf b/public/ng/fonts/octicons.ttf new file mode 100755 index 0000000000..b850701aea Binary files /dev/null and b/public/ng/fonts/octicons.ttf differ diff --git a/public/ng/fonts/octicons.woff b/public/ng/fonts/octicons.woff new file mode 100755 index 0000000000..c1e76ab4a3 Binary files /dev/null and b/public/ng/fonts/octicons.woff differ diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js new file mode 100644 index 0000000000..e5f109af01 --- /dev/null +++ b/public/ng/js/gogs.js @@ -0,0 +1,205 @@ +// @codekit-prepend "lib/jquery-1.11.1.min.js" +// @codekit-prepend "lib/tabs.js" + +(function ($) { + // extend jQuery ajax, set csrf token value + var ajax = $.ajax; + $.extend({ + ajax: function (url, options) { + if (typeof url === 'object') { + options = url; + url = undefined; + } + options = options || {}; + url = options.url; + var csrftoken = $('meta[name=_csrf]').attr('content'); + var headers = options.headers || {}; + var domain = document.domain.replace(/\./ig, '\\.'); + if (!/^(http:|https:).*/.test(url) || eval('/^(http:|https:)\\/\\/(.+\\.)*' + domain + '.*/').test(url)) { + headers = $.extend(headers, {'X-Csrf-Token': csrftoken}); + } + options.headers = headers; + var callback = options.success; + options.success = function (data) { + if (data.once) { + // change all _once value if ajax data.once exist + $('[name=_once]').val(data.once); + } + if (callback) { + callback.apply(this, arguments); + } + }; + return ajax(url, options); + }, + + changeHash: function (hash) { + if (history.pushState) { + history.pushState(null, null, hash); + } + else { + location.hash = hash; + } + }, + + deSelect: function () { + if (window.getSelection) { + window.getSelection().removeAllRanges(); + } else { + document.selection.empty(); + } + } + }); +}(jQuery)); + +$(document).ready(function () { + Tabs('#dashboard-sidebar-menu'); + + homepage(); + settingsProfile(); + settingsSSHKeys(); + settingsDelete(); + renderMarkdown(); + renderCodeView(); + + // Fix language drop-down menu height. + var l = $('#footer-lang li').length; + $('#footer-lang .drop-down').css({ + "top": (-31 * l) + "px", + "height": (31 * l - 3) + "px" + }); +}); + +function homepage() { + // Change method to GET if no username input. + $('#promo-form').submit(function (e) { + if ($('#username').val() === "") { + e.preventDefault(); + window.location.href = '/user/login'; + return true + } + }); + // Redirect to register page. + $('#register-button').click(function (e) { + if ($('#username').val() === "") { + e.preventDefault(); + window.location.href = '/user/sign_up'; + return true + } + $('#promo-form').attr('action', '/user/sign_up'); + }); +} + +function settingsProfile() { + // Confirmation of change username in user profile page. + $('#user-profile-form').submit(function (e) { + if (($('#username').data('uname') != $('#username').val()) && !confirm('Username has been changed, do you want to continue?')) { + e.preventDefault(); + return true; + } + }); +} + +function settingsSSHKeys() { + // Show add SSH key panel. + $('#ssh-add').click(function () { + $('#user-ssh-add-form').removeClass("hide"); + }); +} + +function settingsDelete() { + // Confirmation of delete account. + $('#delete-account-button').click(function (e) { + if (!confirm('This account is going to deleted, do you want to continue?')) { + e.preventDefault(); + return true; + } + }); +} + +function renderMarkdown() { + var $md = $('.markdown'); + var $pre = $md.find('pre > code').parent(); + $pre.addClass('prettyprint linenums'); + prettyPrint(); + + // Set anchor. + var headers = {}; + $md.find('h1, h2, h3, h4, h5, h6').each(function () { + var node = $(this); + var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-')); + var name = val; + if (headers[val] > 0) { + name = val + '-' + headers[val]; + } + if (headers[val] == undefined) { + headers[val] = 1; + } else { + headers[val] += 1; + } + node = node.wrap(''); + node.append(''); + }); +} + +function renderCodeView() { + function selectRange($list, $select, $from) { + $list.removeClass('active'); + if ($from) { + var a = parseInt($select.attr('rel').substr(1)); + var b = parseInt($from.attr('rel').substr(1)); + var c; + if (a != b) { + if (a > b) { + c = a; + a = b; + b = c; + } + var classes = []; + for (i = a; i <= b; i++) { + classes.push('.L' + i); + } + $list.filter(classes.join(',')).addClass('active'); + $.changeHash('#L' + a + '-' + 'L' + b); + return + } + } + $select.addClass('active'); + $.changeHash('#' + $select.attr('rel')); + } + + $(document).on('click', '.lines-num span', function (e) { + var $select = $(this); + var $list = $select.parent().siblings('.lines-code').find('ol.linenums > li'); + selectRange($list, $list.filter('[rel=' + $select.attr('rel') + ']'), (e.shiftKey ? $list.filter('.active').eq(0) : null)); + $.deSelect(); + }); + + $('.code-view .lines-code > pre').each(function () { + var $pre = $(this); + var $lineCode = $pre.parent(); + var $lineNums = $lineCode.siblings('.lines-num'); + if ($lineNums.length > 0) { + var nums = $pre.find('ol.linenums > li').length; + for (var i = 1; i <= nums; i++) { + $lineNums.append('' + i + ''); + } + } + }); + + $(window).on('hashchange', function (e) { + var m = window.location.hash.match(/^#(L\d+)\-(L\d+)$/); + var $list = $('.code-view ol.linenums > li'); + if (m) { + var $first = $list.filter('.' + m[1]); + selectRange($list, $first, $list.filter('.' + m[2])); + $("html, body").scrollTop($first.offset().top - 200); + return; + } + m = window.location.hash.match(/^#(L\d+)$/); + if (m) { + var $first = $list.filter('.' + m[1]); + selectRange($list, $first); + $("html, body").scrollTop($first.offset().top - 200); + } + }).trigger('hashchange'); +} \ No newline at end of file diff --git a/public/ng/js/lib/jquery-1.11.1.min.js b/public/ng/js/lib/jquery-1.11.1.min.js new file mode 100644 index 0000000000..ab28a24729 --- /dev/null +++ b/public/ng/js/lib/jquery-1.11.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"| t |
").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/public/ng/js/lib/lib.js b/public/ng/js/lib/lib.js
new file mode 100644
index 0000000000..4264c66eb7
--- /dev/null
+++ b/public/ng/js/lib/lib.js
@@ -0,0 +1,168 @@
+// pretty print
+!function(){var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function S(a){function d(e){var b=e.charCodeAt(0);if(b!==92)return b;var a=e.charAt(1);return(b=r[a])?b:"0"<=a&&a<="7"?parseInt(e.substring(1),8):a==="u"||a==="x"?parseInt(e.substring(2),16):e.charCodeAt(1)}function g(e){if(e<32)return(e<16?"\\x0":"\\x")+e.toString(16);e=String.fromCharCode(e);return e==="\\"||e==="-"||e==="]"||e==="^"?"\\"+e:e}function b(e){var b=e.substring(1,e.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),e=[],a=
+b[0]==="^",c=["["];a&&c.push("^");for(var a=a?1:0,f=b.length;a122||(l<65||h>90||e.push([Math.max(65,h)|32,Math.min(l,90)|32]),l<97||h>122||e.push([Math.max(97,h)&-33,Math.min(l,122)&-33]))}}e.sort(function(e,a){return e[0]-a[0]||a[1]-e[1]});b=[];f=[];for(a=0;ah[0]&&(h[1]+1>h[0]&&c.push("-"),c.push(g(h[1])));c.push("]");return c.join("")}function s(e){for(var a=e.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),c=a.length,d=[],f=0,h=0;f=2&&e==="["?a[f]=b(l):e!=="\\"&&(a[f]=l.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return a.join("")}for(var x=0,m=!1,j=!1,k=0,c=a.length;k=5&&"lang-"===w.substring(0,5))&&!(t&&typeof t[1]==="string"))f=!1,w="src";f||(r[z]=w)}h=c;c+=z.length;if(f){f=t[1];var l=z.indexOf(f),B=l+f.length;t[2]&&(B=z.length-t[2].length,l=B-f.length);w=w.substring(5);H(j+h,z.substring(0,l),g,k);H(j+h+l,f,I(w,f),k);H(j+h+B,z.substring(B),g,k)}else k.push(j+h,w)}a.g=k}var b={},s;(function(){for(var g=a.concat(d),j=[],k={},c=0,i=g.length;c=0;)b[n.charAt(e)]=r;r=r[1];n=""+r;k.hasOwnProperty(n)||(j.push(r),k[n]=q)}j.push(/[\S\s]/);s=S(j)})();var x=d.length;return g}function v(a){var d=[],g=[];a.tripleQuotedStrings?d.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?d.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):d.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&g.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var b=a.hashComments;b&&(a.cStyleComments?(b>1?d.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):d.push(["com",/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),g.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,q])):d.push(["com",
+/^#[^\n\r]*/,q,"#"]));a.cStyleComments&&(g.push(["com",/^\/\/[^\n\r]*/,q]),g.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));if(b=a.regexLiterals){var s=(b=b>1?"":"\n\r")?".":"[\\S\\s]";g.push(["lang-regex",RegExp("^(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*("+("/(?=[^/*"+b+"])(?:[^/\\x5B\\x5C"+b+"]|\\x5C"+s+"|\\x5B(?:[^\\x5C\\x5D"+b+"]|\\x5C"+
+s+")*(?:\\x5D|$))+/")+")")])}(b=a.types)&&g.push(["typ",b]);b=(""+a.keywords).replace(/^ | $/g,"");b.length&&g.push(["kwd",RegExp("^(?:"+b.replace(/[\s,]+/g,"|")+")\\b"),q]);d.push(["pln",/^\s+/,q," \r\n\t\u00a0"]);b="^.[^\\s\\w.$@'\"`/\\\\]*";a.regexLiterals&&(b+="(?!s*/)");g.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,
+q],["pun",RegExp(b),q]);return C(d,g)}function J(a,d,g){function b(a){var c=a.nodeType;if(c==1&&!x.test(a.className))if("br"===a.nodeName)s(a),a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)b(a);else if((c==3||c==4)&&g){var d=a.nodeValue,i=d.match(m);if(i)c=d.substring(0,i.index),a.nodeValue=c,(d=d.substring(i.index+i[0].length))&&a.parentNode.insertBefore(j.createTextNode(d),a.nextSibling),s(a),c||a.parentNode.removeChild(a)}}function s(a){function b(a,c){var d=
+c?a.cloneNode(!1):a,e=a.parentNode;if(e){var e=b(e,1),g=a.nextSibling;e.appendChild(d);for(var i=g;i;i=g)g=i.nextSibling,e.appendChild(i)}return d}for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),d;(d=a.parentNode)&&d.nodeType===1;)a=d;c.push(a)}for(var x=/(?:^|\s)nocode(?:\s|$)/,m=/\r\n?|\n/,j=a.ownerDocument,k=j.createElement("li");a.firstChild;)k.appendChild(a.firstChild);for(var c=[k],i=0;i=0;){var b=d[g];F.hasOwnProperty(b)?D.console&&console.warn("cannot override language handler %s",b):F[b]=a}}function I(a,d){if(!a||!F.hasOwnProperty(a))a=/^\s*=l&&(b+=2);g>=B&&(r+=2)}}finally{if(f)f.style.display=h}}catch(u){D.console&&console.log(u&&u.stack||u)}}var D=window,y=["break,continue,do,else,for,if,return,while"],E=[[y,"auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],M=[E,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],N=[E,"abstract,assert,boolean,byte,extends,final,finally,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient"],
+O=[N,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"],E=[E,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],P=[y,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+Q=[y,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],W=[y,"as,assert,const,copy,drop,enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"],y=[y,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],R=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/,
+V=/\S/,X=v({keywords:[M,O,E,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",P,Q,y],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),F={};p(X,["default-code"]);p(C([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",
+/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);p(C([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],
+["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);p(C([],[["atv",/^[\S\s]+/]]),["uq.val"]);p(v({keywords:M,hashComments:!0,cStyleComments:!0,types:R}),["c","cc","cpp","cxx","cyc","m"]);p(v({keywords:"null,true,false"}),["json"]);p(v({keywords:O,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:R}),
+["cs"]);p(v({keywords:N,cStyleComments:!0}),["java"]);p(v({keywords:y,hashComments:!0,multiLineStrings:!0}),["bash","bsh","csh","sh"]);p(v({keywords:P,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),["cv","py","python"]);p(v({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:2}),["perl","pl","pm"]);p(v({keywords:Q,
+hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb","ruby"]);p(v({keywords:E,cStyleComments:!0,regexLiterals:!0}),["javascript","js"]);p(v({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes",hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);p(v({keywords:W,cStyleComments:!0,multilineStrings:!0}),["rc","rs","rust"]);
+p(C([],[["str",/^[\S\s]+/]]),["regex"]);var Y=D.PR={createSimpleLexer:C,registerLangHandler:p,sourceDecorator:v,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ",prettyPrintOne:D.prettyPrintOne=function(a,d,g){var b=document.createElement("div");b.innerHTML=")/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}\b/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);
+
+// lang-dart.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"]],[["com",/^#!.*/],["kwd",/^\b(?:import|library|part of|part|as|show|hide)\b/i],["com",/^\/\/.*/],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["kwd",/^\b(?:class|interface)\b/i],["kwd",/^\b(?:assert|break|case|catch|continue|default|do|else|finally|for|if|in|is|new|return|super|switch|this|throw|try|while)\b/i],["kwd",/^\b(?:abstract|const|extends|factory|final|get|implements|native|operator|set|static|typedef|var)\b/i],
+["typ",/^\b(?:bool|double|dynamic|int|num|object|string|void)\b/i],["kwd",/^\b(?:false|null|true)\b/i],["str",/^r?'''[\S\s]*?[^\\]'''/],["str",/^r?"""[\S\s]*?[^\\]"""/],["str",/^r?'('|[^\n\f\r]*?[^\\]')/],["str",/^r?"("|[^\n\f\r]*?[^\\]")/],["pln",/^[$_a-z]\w*/i],["pun",/^[!%&*+/:<-?^|~-]/],["lit",/^\b0x[\da-f]+/i],["lit",/^\b\d+(?:\.\d*)?(?:e[+-]?\d+)?/i],["lit",/^\b\.\d+(?:e[+-]?\d+)?/i],["pun",/^[(),.;[\]{}]/]]),
+["dart"]);
+
+// lang-erlang.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t-\r ]+/,null,"\t\n\u000b\u000c\r "],["str",/^"(?:[^\n\f\r"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["lit",/^[a-z]\w*/],["lit",/^'(?:[^\n\f\r'\\]|\\[^&])+'?/,null,"'"],["lit",/^\?[^\t\n ({]+/,null,"?"],["lit",/^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,null,"0123456789"]],[["com",/^%[^\n]*/],["kwd",/^(?:module|attributes|do|let|in|letrec|apply|call|primop|case|of|end|when|fun|try|catch|receive|after|char|integer|float,atom,string,var)\b/],
+["kwd",/^-[_a-z]+/],["typ",/^[A-Z_]\w*/],["pun",/^[,.;]/]]),["erlang","erl"]);
+
+// lang-go.js
+// PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["pln",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])+(?:'|$)|`[^`]*(?:`|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\/\*[\S\s]*?\*\/)/],["pln",/^(?:[^"'/`]|\/(?![*/]))+/]]),["go"]);
+
+// lang-hs.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t-\r ]+/,null,"\t\n\u000b\u000c\r "],["str",/^"(?:[^\n\f\r"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["str",/^'(?:[^\n\f\r'\\]|\\[^&])'?/,null,"'"],["lit",/^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,null,"0123456789"]],[["com",/^(?:--+[^\n\f\r]*|{-(?:[^-]|-+[^}-])*-})/],["kwd",/^(?:case|class|data|default|deriving|do|else|if|import|in|infix|infixl|infixr|instance|let|module|newtype|of|then|type|where|_)(?=[^\d'A-Za-z]|$)/,
+null],["pln",/^(?:[A-Z][\w']*\.)*[A-Za-z][\w']*/],["pun",/^[^\d\t-\r "'A-Za-z]+/]]),["hs"]);
+
+// lang-lisp.js
+var a=null;
+PR.registerLangHandler(PR.createSimpleLexer([["opn",/^\(+/,a,"("],["clo",/^\)+/,a,")"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \u00a0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:block|c[ad]+r|catch|con[ds]|def(?:ine|un)|do|eq|eql|equal|equalp|eval-when|flet|format|go|if|labels|lambda|let|load-time-value|locally|macrolet|multiple-value-call|nil|progn|progv|quote|require|return-from|setq|symbol-macrolet|t|tagbody|the|throw|unwind)\b/,a],
+["lit",/^[+-]?(?:[#0]x[\da-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[de][+-]?\d+)?)/i],["lit",/^'(?:-*(?:\w|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?)?/],["pln",/^-*(?:[_a-z]|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?/i],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["cl","el","lisp","lsp","scm","ss","rkt"]);
+
+// lang-llvm.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^!?"(?:[^"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["com",/^;[^\n\r]*/,null,";"]],[["pln",/^[!%@](?:[$\-.A-Z_a-z][\w$\-.]*|\d+)/],["kwd",/^[^\W\d]\w*/,null],["lit",/^\d+\.\d+/],["lit",/^(?:\d+|0[Xx][\dA-Fa-f]+)/],["pun",/^[(-*,:<->[\]{}]|\.\.\.$/]]),["llvm","ll"]);
+
+// lang-lua.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$))/,null,"\"'"]],[["com",/^--(?:\[(=*)\[[\S\s]*?(?:]\1]|$)|[^\n\r]*)/],["str",/^\[(=*)\[[\S\s]*?(?:]\1]|$)/],["kwd",/^(?:and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],
+["pln",/^[_a-z]\w*/i],["pun",/^[^\w\t\n\r \xa0][^\w\t\n\r "'+=\xa0-]*/]]),["lua"]);
+
+// lang-ml.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["com",/^#(?:if[\t\n\r \xa0]+(?:[$_a-z][\w']*|``[^\t\n\r`]*(?:``|$))|else|endif|light)/i,null,"#"],["str",/^(?:"(?:[^"\\]|\\[\S\s])*(?:"|$)|'(?:[^'\\]|\\[\S\s])(?:'|$))/,null,"\"'"]],[["com",/^(?:\/\/[^\n\r]*|\(\*[\S\s]*?\*\))/],["kwd",/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],
+["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^(?:[_a-z][\w']*[!#?]?|``[^\t\n\r`]*(?:``|$))/i],["pun",/^[^\w\t\n\r "'\xa0]+/]]),["fs","ml"]);
+
+// lang-mumps.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^"(?:[^"]|\\.)*"/,null,'"']],[["com",/^;[^\n\r]*/,null,";"],["dec",/^\$(?:d|device|ec|ecode|es|estack|et|etrap|h|horolog|i|io|j|job|k|key|p|principal|q|quit|st|stack|s|storage|sy|system|t|test|tl|tlevel|tr|trestart|x|y|z[a-z]*|a|ascii|c|char|d|data|e|extract|f|find|fn|fnumber|g|get|j|justify|l|length|na|name|o|order|p|piece|ql|qlength|qs|qsubscript|q|query|r|random|re|reverse|s|select|st|stack|t|text|tr|translate|nan)\b/i,
+null],["kwd",/^(?:[^$]b|break|c|close|d|do|e|else|f|for|g|goto|h|halt|h|hang|i|if|j|job|k|kill|l|lock|m|merge|n|new|o|open|q|quit|r|read|s|set|tc|tcommit|tre|trestart|tro|trollback|ts|tstart|u|use|v|view|w|write|x|xecute)\b/i,null],["lit",/^[+-]?(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?/i],["pln",/^[a-z][^\W_]*/i],["pun",/^[^\w\t\n\r"$%;^\xa0]|_/]]),["mumps"]);
+
+// lang-n.js
+var a=null;
+PR.registerLangHandler(PR.createSimpleLexer([["str",/^(?:'(?:[^\n\r'\\]|\\.)*'|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,a,'"'],["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,a,"#"],["pln",/^\s+/,a," \r\n\t\u00a0"]],[["str",/^@"(?:[^"]|"")*(?:"|$)/,a],["str",/^<#[^#>]*(?:#>|$)/,a],["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,a],["com",/^\/\/[^\n\r]*/,a],["com",/^\/\*[\S\s]*?(?:\*\/|$)/,
+a],["kwd",/^(?:abstract|and|as|base|catch|class|def|delegate|enum|event|extern|false|finally|fun|implements|interface|internal|is|macro|match|matches|module|mutable|namespace|new|null|out|override|params|partial|private|protected|public|ref|sealed|static|struct|syntax|this|throw|true|try|type|typeof|using|variant|virtual|volatile|when|where|with|assert|assert2|async|break|checked|continue|do|else|ensures|for|foreach|if|late|lock|new|nolate|otherwise|regexp|repeat|requires|return|surroundwith|unchecked|unless|using|while|yield)\b/,
+a],["typ",/^(?:array|bool|byte|char|decimal|double|float|int|list|long|object|sbyte|short|string|ulong|uint|ufloat|ulong|ushort|void)\b/,a],["lit",/^@[$_a-z][\w$@]*/i,a],["typ",/^@[A-Z]+[a-z][\w$@]*/,a],["pln",/^'?[$_a-z][\w$@]*/i,a],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,a,"0123456789"],["pun",/^.[^\s\w"-$'./@`]*/,a]]),["n","nemerle"]);
+
+// lang-pascal.js
+var a=null;
+PR.registerLangHandler(PR.createSimpleLexer([["str",/^'(?:[^\n\r'\\]|\\.)*(?:'|$)/,a,"'"],["pln",/^\s+/,a," \r\n\t\u00a0"]],[["com",/^\(\*[\S\s]*?(?:\*\)|$)|^{[\S\s]*?(?:}|$)/,a],["kwd",/^(?:absolute|and|array|asm|assembler|begin|case|const|constructor|destructor|div|do|downto|else|end|external|for|forward|function|goto|if|implementation|in|inline|interface|interrupt|label|mod|not|object|of|or|packed|procedure|program|record|repeat|set|shl|shr|then|to|type|unit|until|uses|var|virtual|while|with|xor)\b/i,a],
+["lit",/^(?:true|false|self|nil)/i,a],["pln",/^[a-z][^\W_]*/i,a],["lit",/^(?:\$[\da-f]+|(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?)/i,a,"0123456789"],["pun",/^.[^\s\w$'./@]*/,a]]),["pascal"]);
+
+// lang-proto.js
+PR.registerLangHandler(PR.sourceDecorator({keywords:"bytes,default,double,enum,extend,extensions,false,group,import,max,message,option,optional,package,repeated,required,returns,rpc,service,syntax,to,true",types:/^(bool|(double|s?fixed|[su]?int)(32|64)|float|string)\b/,cStyleComments:!0}),["proto"]);
+
+// lang-r.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,null,'"'],["str",/^'(?:[^'\\]|\\[\S\s])*(?:'|$)/,null,"'"]],[["com",/^#.*/],["kwd",/^(?:if|else|for|while|repeat|in|next|break|return|switch|function)(?![\w.])/],["lit",/^0[Xx][\dA-Fa-f]+([Pp]\d+)?[Li]?/],["lit",/^[+-]?(\d+(\.\d+)?|\.\d+)([Ee][+-]?\d+)?[Li]?/],["lit",/^(?:NULL|NA(?:_(?:integer|real|complex|character)_)?|Inf|TRUE|FALSE|NaN|\.\.(?:\.|\d+))(?![\w.])/],
+["pun",/^(?:<>?|-|==|<=|>=|<|>|&&?|!=|\|\|?|[!*+/^]|%.*?%|[$=@~]|:{1,3}|[(),;?[\]{}])/],["pln",/^(?:[A-Za-z]+[\w.]*|\.[^\W\d][\w.]*)(?![\w.])/],["str",/^`.+`/]]),["r","s","R","S","Splus"]);
+
+// lang-rd.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["com",/^%[^\n\r]*/,null,"%"]],[["lit",/^\\(?:cr|l?dots|R|tab)\b/],["kwd",/^\\[@-Za-z]+/],["kwd",/^#(?:ifn?def|endif)/],["pln",/^\\[{}]/],["pun",/^[()[\]{}]+/]]),["Rd","rd"]);
+
+// lang-scala.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^"(?:""(?:""?(?!")|[^"\\]|\\.)*"{0,3}|(?:[^\n\r"\\]|\\.)*"?)/,null,'"'],["lit",/^`(?:[^\n\r\\`]|\\.)*`?/,null,"`"],["pun",/^[!#%&(--:-@[-^{-~]+/,null,"!#%&()*+,-:;<=>?@[\\]^{|}~"]],[["str",/^'(?:[^\n\r'\\]|\\(?:'|[^\n\r']+))'/],["lit",/^'[$A-Z_a-z][\w$]*(?![\w$'])/],["kwd",/^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/],
+["lit",/^(?:true|false|null|this)\b/],["lit",/^(?:0(?:[0-7]+|x[\da-f]+)l?|(?:0|[1-9]\d*)(?:(?:\.\d+)?(?:e[+-]?\d+)?f?|l?)|\\.\d+(?:e[+-]?\d+)?f?)/i],["typ",/^[$_]*[A-Z][\d$A-Z_]*[a-z][\w$]*/],["pln",/^[$A-Z_a-z][\w$]*/],["com",/^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/],["pun",/^(?:\.+|\/)/]]),["scala"]);
+
+// lang-sql.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["str",/^(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')/,null,"\"'"]],[["com",/^(?:--[^\n\r]*|\/\*[\S\s]*?(?:\*\/|$))/],["kwd",/^(?:add|all|alter|and|any|apply|as|asc|authorization|backup|begin|between|break|browse|bulk|by|cascade|case|check|checkpoint|close|clustered|coalesce|collate|column|commit|compute|connect|constraint|contains|containstable|continue|convert|create|cross|current|current_date|current_time|current_timestamp|current_user|cursor|database|dbcc|deallocate|declare|default|delete|deny|desc|disk|distinct|distributed|double|drop|dummy|dump|else|end|errlvl|escape|except|exec|execute|exists|exit|fetch|file|fillfactor|following|for|foreign|freetext|freetexttable|from|full|function|goto|grant|group|having|holdlock|identity|identitycol|identity_insert|if|in|index|inner|insert|intersect|into|is|join|key|kill|left|like|lineno|load|match|matched|merge|natural|national|nocheck|nonclustered|nocycle|not|null|nullif|of|off|offsets|on|open|opendatasource|openquery|openrowset|openxml|option|or|order|outer|over|partition|percent|pivot|plan|preceding|precision|primary|print|proc|procedure|public|raiserror|read|readtext|reconfigure|references|replication|restore|restrict|return|revoke|right|rollback|rowcount|rowguidcol|rows?|rule|save|schema|select|session_user|set|setuser|shutdown|some|start|statistics|system_user|table|textsize|then|to|top|tran|transaction|trigger|truncate|tsequal|unbounded|union|unique|unpivot|update|updatetext|use|user|using|values|varying|view|waitfor|when|where|while|with|within|writetext|xml)(?=[^\w-]|$)/i,
+null],["lit",/^[+-]?(?:0x[\da-f]+|(?:\.\d+|\d+(?:\.\d*)?)(?:e[+-]?\d+)?)/i],["pln",/^[_a-z][\w-]*/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'+\xa0-]*/]]),["sql"]);
+
+// lang-tcl.js
+var a=null;
+PR.registerLangHandler(PR.createSimpleLexer([["opn",/^{+/,a,"{"],["clo",/^}+/,a,"}"],["com",/^#[^\n\r]*/,a,"#"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \u00a0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:after|append|apply|array|break|case|catch|continue|error|eval|exec|exit|expr|for|foreach|if|incr|info|proc|return|set|switch|trace|uplevel|upvar|while)\b/,a],["lit",/^[+-]?(?:[#0]x[\da-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[de][+-]?\d+)?)/i],["lit",
+/^'(?:-*(?:\w|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?)?/],["pln",/^-*(?:[_a-z]|\\[!-~])(?:[\w-]*|\\[!-~])[!=?]?/i],["pun",/^[^\w\t\n\r "'-);\\\xa0]+/]]),["tcl"]);
+
+// lang-tex.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"],["com",/^%[^\n\r]*/,null,"%"]],[["kwd",/^\\[@-Za-z]+/],["kwd",/^\\./],["typ",/^[$&]/],["lit",/[+-]?(?:\.\d+|\d+(?:\.\d*)?)(cm|em|ex|in|pc|pt|bp|mm)/i],["pun",/^[()=[\]{}]+/]]),["latex","tex"]);
+
+// lang-vb.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0\u2028\u2029]+/,null,"\t\n\r \u00a0\u2028\u2029"],["str",/^(?:["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})(?:["\u201c\u201d]c|$)|["\u201c\u201d](?:[^"\u201c\u201d]|["\u201c\u201d]{2})*(?:["\u201c\u201d]|$))/i,null,'"\u201c\u201d'],["com",/^['\u2018\u2019](?:_(?:\r\n?|[^\r]?)|[^\n\r_\u2028\u2029])*/,null,"'\u2018\u2019"]],[["kwd",/^(?:addhandler|addressof|alias|and|andalso|ansi|as|assembly|auto|boolean|byref|byte|byval|call|case|catch|cbool|cbyte|cchar|cdate|cdbl|cdec|char|cint|class|clng|cobj|const|cshort|csng|cstr|ctype|date|decimal|declare|default|delegate|dim|directcast|do|double|each|else|elseif|end|endif|enum|erase|error|event|exit|finally|for|friend|function|get|gettype|gosub|goto|handles|if|implements|imports|in|inherits|integer|interface|is|let|lib|like|long|loop|me|mod|module|mustinherit|mustoverride|mybase|myclass|namespace|new|next|not|notinheritable|notoverridable|object|on|option|optional|or|orelse|overloads|overridable|overrides|paramarray|preserve|private|property|protected|public|raiseevent|readonly|redim|removehandler|resume|return|select|set|shadows|shared|short|single|static|step|stop|string|structure|sub|synclock|then|throw|to|try|typeof|unicode|until|variant|wend|when|while|with|withevents|writeonly|xor|endif|gosub|let|variant|wend)\b/i,
+null],["com",/^rem\b.*/i],["lit",/^(?:true\b|false\b|nothing\b|\d+(?:e[+-]?\d+[dfr]?|[dfilrs])?|(?:&h[\da-f]+|&o[0-7]+)[ils]?|\d*\.\d+(?:e[+-]?\d+)?[dfr]?|#\s+(?:\d+[/-]\d+[/-]\d+(?:\s+\d+:\d+(?::\d+)?(\s*(?:am|pm))?)?|\d+:\d+(?::\d+)?(\s*(?:am|pm))?)\s+#)/i],["pln",/^(?:(?:[a-z]|_\w)\w*(?:\[[!#%&@]+])?|\[(?:[a-z]|_\w)\w*])/i],["pun",/^[^\w\t\n\r "'[\]\xa0\u2018\u2019\u201c\u201d\u2028\u2029]+/],["pun",/^(?:\[|])/]]),["vb","vbs"]);
+
+// lang-vhdl.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xa0]+/,null,"\t\n\r \u00a0"]],[["str",/^(?:[box]?"(?:[^"]|"")*"|'.')/i],["com",/^--[^\n\r]*/],["kwd",/^(?:abs|access|after|alias|all|and|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|mod|nand|new|next|nor|not|null|of|on|open|or|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|rem|report|return|rol|ror|select|severity|shared|signal|sla|sll|sra|srl|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|xnor|xor)(?=[^\w-]|$)/i,
+null],["typ",/^(?:bit|bit_vector|character|boolean|integer|real|time|string|severity_level|positive|natural|signed|unsigned|line|text|std_u?logic(?:_vector)?)(?=[^\w-]|$)/i,null],["typ",/^'(?:active|ascending|base|delayed|driving|driving_value|event|high|image|instance_name|last_active|last_event|last_value|left|leftof|length|low|path_name|pos|pred|quiet|range|reverse_range|right|rightof|simple_name|stable|succ|transaction|val|value)(?=[^\w-]|$)/i,null],["lit",/^\d+(?:_\d+)*(?:#[\w.\\]+#(?:[+-]?\d+(?:_\d+)*)?|(?:\.\d+(?:_\d+)*)?(?:e[+-]?\d+(?:_\d+)*)?)/i],
+["pln",/^(?:[a-z]\w*|\\[^\\]*\\)/i],["pun",/^[^\w\t\n\r "'\xa0][^\w\t\n\r "'\xa0-]*/]]),["vhdl","vhd"]);
+
+// lang-wiki.js
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\d\t a-gi-z\xa0]+/,null,"\t \u00a0abcdefgijklmnopqrstuvwxyz0123456789"],["pun",/^[*=[\]^~]+/,null,"=*~^[]"]],[["lang-wiki.meta",/(?:^^|\r\n?|\n)(#[a-z]+)\b/],["lit",/^[A-Z][a-z][\da-z]+[A-Z][a-z][^\W_]+\b/],["lang-",/^{{{([\S\s]+?)}}}/],["lang-",/^`([^\n\r`]+)`/],["str",/^https?:\/\/[^\s#/?]*(?:\/[^\s#?]*)?(?:\?[^\s#]*)?(?:#\S*)?/i],["pln",/^(?:\r\n|[\S\s])[^\n\r#*=A-[^`h{~]*/]]),["wiki"]);
+PR.registerLangHandler(PR.createSimpleLexer([["kwd",/^#[a-z]+/i,null,"#"]],[]),["wiki.meta"]);
+
+// lang-yaml.js
+var a=null;
+var a=null;
+PR.registerLangHandler(PR.createSimpleLexer([["pun",/^[:>?|]+/,a,":|>?"],["dec",/^%(?:YAML|TAG)[^\n\r#]+/,a,"%"],["typ",/^&\S+/,a,"&"],["typ",/^!\S*/,a,"!"],["str",/^"(?:[^"\\]|\\.)*(?:"|$)/,a,'"'],["str",/^'(?:[^']|'')*(?:'|$)/,a,"'"],["com",/^#[^\n\r]*/,a,"#"],["pln",/^\s+/,a," \t\r\n"]],[["dec",/^(?:---|\.\.\.)(?:[\n\r]|$)/],["pun",/^-/],["kwd",/^\w+:[\n\r ]/],["pln",/^\w+/]]),["yaml","yml"]);
+
+/*
+ * zClip :: jQuery ZeroClipboard v1.1.1
+ * http://steamdev.com/zclip
+ *
+ * Copyright 2011, SteamDev
+ * Released under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: Wed Jun 01, 2011
+ */
+
+(function(a){a.fn.zclip=function(c){if(typeof c=="object"&&!c.length){var b=a.extend({path:"ZeroClipboard.swf",copy:null,beforeCopy:null,afterCopy:null,clickAfter:true,setHandCursor:true,setCSSEffects:true},c);return this.each(function(){var e=a(this);if(e.is(":visible")&&(typeof b.copy=="string"||a.isFunction(b.copy))){ZeroClipboard.setMoviePath(b.path);var d=new ZeroClipboard.Client();if(a.isFunction(b.copy)){e.bind("zClip_copy",b.copy)}if(a.isFunction(b.beforeCopy)){e.bind("zClip_beforeCopy",b.beforeCopy)}if(a.isFunction(b.afterCopy)){e.bind("zClip_afterCopy",b.afterCopy)}d.setHandCursor(b.setHandCursor);d.setCSSEffects(b.setCSSEffects);d.addEventListener("mouseOver",function(f){e.trigger("mouseenter")});d.addEventListener("mouseOut",function(f){e.trigger("mouseleave")});d.addEventListener("mouseDown",function(f){e.trigger("mousedown");if(!a.isFunction(b.copy)){d.setText(b.copy)}else{d.setText(e.triggerHandler("zClip_copy"))}if(a.isFunction(b.beforeCopy)){e.trigger("zClip_beforeCopy")}});d.addEventListener("complete",function(f,g){if(a.isFunction(b.afterCopy)){e.trigger("zClip_afterCopy")}else{if(g.length>500){g=g.substr(0,500)+"...\n\n("+(g.length-500)+" characters not shown)"}e.removeClass("hover");alert("Copied text to clipboard:\n\n "+g)}if(b.clickAfter){e.trigger("click")}});d.glue(e[0],e.parent()[0]);a(window).bind("load resize",function(){d.reposition()})}})}else{if(typeof c=="string"){return this.each(function(){var f=a(this);c=c.toLowerCase();var e=f.data("zclipId");var d=a("#"+e+".zclip");if(c=="remove"){d.remove();f.removeClass("active hover")}else{if(c=="hide"){d.hide();f.removeClass("active hover")}else{if(c=="show"){d.show()}}}})}}}})(jQuery);var ZeroClipboard={version:"1.0.7",clients:{},moviePath:"ZeroClipboard.swf",nextId:1,$:function(a){if(typeof(a)=="string"){a=document.getElementById(a)}if(!a.addClass){a.hide=function(){/*this.style.display="none"*/};a.show=function(){this.style.display=""};a.addClass=function(b){this.removeClass(b);this.className+=" "+b};a.removeClass=function(d){var e=this.className.split(/\s+/);var b=-1;for(var c=0;c-1){e.splice(b,1);this.className=e.join(" ")}return this};a.hasClass=function(b){return !!this.className.match(new RegExp("\\s*"+b+"\\s*"))}}return a},setMoviePath:function(a){this.moviePath=a},dispatch:function(d,b,c){var a=this.clients[d];if(a){a.receiveEvent(b,c)}},register:function(b,a){this.clients[b]=a},getDOMObjectPosition:function(c,a){var b={left:0,top:0,width:c.width?c.width:c.offsetWidth,height:c.height?c.height:c.offsetHeight};if(c&&(c!=a)){b.left+=c.offsetLeft;b.top+=c.offsetTop}return b},Client:function(a){this.handlers={};this.id=ZeroClipboard.nextId++;this.movieId="ZeroClipboardMovie_"+this.id;ZeroClipboard.register(this.id,this);if(a){this.glue(a)}}};ZeroClipboard.Client.prototype={id:0,ready:false,movie:null,clipText:"",handCursorEnabled:true,cssEffects:true,handlers:null,glue:function(d,b,e){this.domElement=ZeroClipboard.$(d);var f=99;if(this.domElement.style.zIndex){f=parseInt(this.domElement.style.zIndex,10)+1}if(typeof(b)=="string"){b=ZeroClipboard.$(b)}else{if(typeof(b)=="undefined"){b=document.getElementsByTagName("body")[0]}}var c=ZeroClipboard.getDOMObjectPosition(this.domElement,b);this.div=document.createElement("div");this.div.className="zclip";this.div.id="zclip-"+this.movieId;$(this.domElement).data("zclipId","zclip-"+this.movieId);var a=this.div.style;a.position="absolute";a.left=""+c.left+"px";a.top=""+c.top+"px";a.width=""+c.width+"px";a.height=""+c.height+"px";a.zIndex=f;if(typeof(e)=="object"){for(addedStyle in e){a[addedStyle]=e[addedStyle]}}b.appendChild(this.div);this.div.innerHTML=this.getHTML(c.width,c.height)},getHTML:function(d,a){var c="";var b="id="+this.id+"&width="+d+"&height="+a;if(navigator.userAgent.match(/MSIE/)){var e=location.href.match(/^https/i)?"https://":"http://";c+=''}else{c+=''}return c},hide:function(){if(this.div){this.div.style.left="-2000px"}},show:function(){this.reposition()},destroy:function(){if(this.domElement&&this.div){this.hide();this.div.innerHTML="";var a=document.getElementsByTagName("body")[0];try{a.removeChild(this.div)}catch(b){}this.domElement=null;this.div=null}},reposition:function(c){if(c){this.domElement=ZeroClipboard.$(c);if(!this.domElement){this.hide()}}if(this.domElement&&this.div){var b=ZeroClipboard.getDOMObjectPosition(this.domElement);var a=this.div.style;a.left=""+b.left+"px";a.top=""+b.top+"px"}},setText:function(a){this.clipText=a;if(this.ready){this.movie.setText(a)}},addEventListener:function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");if(!this.handlers[a]){this.handlers[a]=[]}this.handlers[a].push(b)},setHandCursor:function(a){this.handCursorEnabled=a;if(this.ready){this.movie.setHandCursor(a)}},setCSSEffects:function(a){this.cssEffects=!!a},receiveEvent:function(d,f){d=d.toString().toLowerCase().replace(/^on/,"");switch(d){case"load":this.movie=document.getElementById(this.movieId);if(!this.movie){var c=this;setTimeout(function(){c.receiveEvent("load",null)},1);return}if(!this.ready&&navigator.userAgent.match(/Firefox/)&&navigator.userAgent.match(/Windows/)){var c=this;setTimeout(function(){c.receiveEvent("load",null)},100);this.ready=true;return}this.ready=true;try{this.movie.setText(this.clipText)}catch(h){}try{this.movie.setHandCursor(this.handCursorEnabled)}catch(h){}break;case"mouseover":if(this.domElement&&this.cssEffects){this.domElement.addClass("hover");if(this.recoverActive){this.domElement.addClass("active")}}break;case"mouseout":if(this.domElement&&this.cssEffects){this.recoverActive=false;if(this.domElement.hasClass("active")){this.domElement.removeClass("active");this.recoverActive=true}this.domElement.removeClass("hover")}break;case"mousedown":if(this.domElement&&this.cssEffects){this.domElement.addClass("active")}break;case"mouseup":if(this.domElement&&this.cssEffects){this.domElement.removeClass("active");this.recoverActive=false}break}if(this.handlers[d]){for(var b=0,a=this.handlers[d].length;b code").parent();t.addClass("prettyprint linenums"),prettyPrint();var n={};e.find("h1, h2, h3, h4, h5, h6").each(function(){var e=$(this),t=encodeURIComponent(e.text().toLowerCase().replace(/[^\w\- ]/g,"").replace(/[ ]/g,"-")),r=t;n[t]>0&&(r=t+"-"+n[t]),void 0==n[t]?n[t]=1:n[t]+=1,e=e.wrap(''),e.append('')})}function renderCodeView(){function e(e,t,n){if(e.removeClass("active"),n){var r=parseInt(t.attr("rel").substr(1)),o=parseInt(n.attr("rel").substr(1)),a;if(r!=o){r>o&&(a=r,r=o,o=a);var s=[];for(i=r;o>=i;i++)s.push(".L"+i);return e.filter(s.join(",")).addClass("active"),void $.changeHash("#L"+r+"-L"+o)}}t.addClass("active"),$.changeHash("#"+t.attr("rel"))}$(document).on("click",".lines-num span",function(t){var n=$(this),r=n.parent().siblings(".lines-code").find("ol.linenums > li");e(r,r.filter("[rel="+n.attr("rel")+"]"),t.shiftKey?r.filter(".active").eq(0):null),$.deSelect()}),$(".code-view .lines-code > pre").each(function(){var e=$(this),t=e.parent(),n=t.siblings(".lines-num");if(n.length>0)for(var r=e.find("ol.linenums > li").length,i=1;r>=i;i++)n.append(''+i+"")}),$(window).on("hashchange",function(t){var n=window.location.hash.match(/^#(L\d+)\-(L\d+)$/),r=$(".code-view ol.linenums > li");if(n){var i=r.filter("."+n[1]);return e(r,i,r.filter("."+n[2])),void $("html, body").scrollTop(i.offset().top-200)}if(n=window.location.hash.match(/^#(L\d+)$/)){var i=r.filter("."+n[1]);e(r,i),$("html, body").scrollTop(i.offset().top-200)}}).trigger("hashchange")}!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=e.length,n=ot.type(e);return"function"===n||ot.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e}function r(e,t,n){if(ot.isFunction(t))return ot.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return ot.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(pt.test(t))return ot.filter(t,e,n);t=ot.filter(t,e)}return ot.grep(e,function(e){return ot.inArray(e,t)>=0!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t=wt[e]={};return ot.each(e.match(xt)||[],function(e,n){t[n]=!0}),t}function a(){mt.addEventListener?(mt.removeEventListener("DOMContentLoaded",s,!1),e.removeEventListener("load",s,!1)):(mt.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(mt.addEventListener||"load"===event.type||"complete"===mt.readyState)&&(a(),ot.ready())}function l(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(Et,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:kt.test(n)?ot.parseJSON(n):n}catch(i){}ot.data(e,t,n)}else n=void 0}return n}function u(e){var t;for(t in e)if(("data"!==t||!ot.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(ot.acceptData(e)){var i,o,a=ot.expando,s=e.nodeType,l=s?ot.cache:e,u=s?e[a]:e[a]&&a;if(u&&l[u]&&(r||l[u].data)||void 0!==n||"string"!=typeof t)return u||(u=s?e[a]=Y.pop()||ot.guid++:a),l[u]||(l[u]=s?{}:{toJSON:ot.noop}),("object"==typeof t||"function"==typeof t)&&(r?l[u]=ot.extend(l[u],t):l[u].data=ot.extend(l[u].data,t)),o=l[u],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[ot.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[ot.camelCase(t)])):i=o,i}}function d(e,t,n){if(ot.acceptData(e)){var r,i,o=e.nodeType,a=o?ot.cache:e,s=o?e[ot.expando]:ot.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){ot.isArray(t)?t=t.concat(ot.map(t,ot.camelCase)):t in r?t=[t]:(t=ot.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!u(r):!ot.isEmptyObject(r))return}(n||(delete a[s].data,u(a[s])))&&(o?ot.cleanData([e],!0):rt.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}function f(){return!0}function p(){return!1}function h(){try{return mt.activeElement}catch(e){}}function m(e){var t=Mt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function g(e,t){var n,r,i=0,o=typeof e.getElementsByTagName!==Ct?e.getElementsByTagName(t||"*"):typeof e.querySelectorAll!==Ct?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||ot.nodeName(r,t)?o.push(r):ot.merge(o,g(r,t));return void 0===t||t&&ot.nodeName(e,t)?ot.merge([e],o):o}function v(e){Lt.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t){return ot.nodeName(e,"table")&&ot.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function b(e){return e.type=(null!==ot.find.attr(e,"type"))+"/"+e.type,e}function x(e){var t=Vt.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function w(e,t){for(var n,r=0;null!=(n=e[r]);r++)ot._data(n,"globalEval",!t||ot._data(t[r],"globalEval"))}function T(e,t){if(1===t.nodeType&&ot.hasData(e)){var n,r,i,o=ot._data(e),a=ot._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)ot.event.add(t,n,s[n][r])}a.data&&(a.data=ot.extend({},a.data))}}function C(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!rt.noCloneEvent&&t[ot.expando]){i=ot._data(t);for(r in i.events)ot.removeEvent(t,r,i.handle);t.removeAttribute(ot.expando)}"script"===n&&t.text!==e.text?(b(t).text=e.text,x(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),rt.html5Clone&&e.innerHTML&&!ot.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Lt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function N(t,n){var r,i=ot(n.createElement(t)).appendTo(n.body),o=e.getDefaultComputedStyle&&(r=e.getDefaultComputedStyle(i[0]))?r.display:ot.css(i[0],"display");return i.detach(),o}function k(e){var t=mt,n=Zt[e];return n||(n=N(e,t),"none"!==n&&n||(Qt=(Qt||ot("")).appendTo(t.documentElement),t=(Qt[0].contentWindow||Qt[0].contentDocument).document,t.write(),t.close(),n=N(e,t),Qt.detach()),Zt[e]=n),n}function E(e,t){return{get:function(){var n=e();return null!=n?n?void delete this.get:(this.get=t).apply(this,arguments):void 0}}}function S(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=pn.length;i--;)if(t=pn[i]+n,t in e)return t;return r}function j(e,t){for(var n,r,i,o=[],a=0,s=e.length;s>a;a++)r=e[a],r.style&&(o[a]=ot._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Dt(r)&&(o[a]=ot._data(r,"olddisplay",k(r.nodeName)))):(i=Dt(r),(n&&"none"!==n||!i)&&ot._data(r,"olddisplay",i?n:ot.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function D(e,t,n){var r=un.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function A(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=ot.css(e,n+jt[o],!0,i)),r?("content"===n&&(a-=ot.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(a-=ot.css(e,"border"+jt[o]+"Width",!0,i))):(a+=ot.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(a+=ot.css(e,"border"+jt[o]+"Width",!0,i)));return a}function L(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=nn(e),a=rt.boxSizing&&"border-box"===ot.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=rn(e,t,o),(0>i||null==i)&&(i=e.style[t]),tn.test(i))return i;r=a&&(rt.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+A(e,t,n||(a?"border":"content"),r,o)+"px"}function H(e,t,n,r,i){return new H.prototype.init(e,t,n,r,i)}function _(){return setTimeout(function(){hn=void 0}),hn=ot.now()}function q(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=jt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function M(e,t,n){for(var r,i=(xn[t]||[]).concat(xn["*"]),o=0,a=i.length;a>o;o++)if(r=i[o].call(n,t,e))return r}function O(e,t,n){var r,i,o,a,s,l,u,c,d=this,f={},p=e.style,h=e.nodeType&&Dt(e),m=ot._data(e,"fxshow");n.queue||(s=ot._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,d.always(function(){d.always(function(){s.unqueued--,ot.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],u=ot.css(e,"display"),c="none"===u?ot._data(e,"olddisplay")||k(e.nodeName):u,"inline"===c&&"none"===ot.css(e,"float")&&(rt.inlineBlockNeedsLayout&&"inline"!==k(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",rt.shrinkWrapBlocks()||d.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],gn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!m||void 0===m[r])continue;h=!0}f[r]=m&&m[r]||ot.style(e,r)}else u=void 0;if(ot.isEmptyObject(f))"inline"===("none"===u?k(e.nodeName):u)&&(p.display=u);else{m?"hidden"in m&&(h=m.hidden):m=ot._data(e,"fxshow",{}),o&&(m.hidden=!h),h?ot(e).show():d.done(function(){ot(e).hide()}),d.done(function(){var t;ot._removeData(e,"fxshow");for(t in f)ot.style(e,t,f[t])});for(r in f)a=M(h?m[r]:0,r,d),r in m||(m[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function F(e,t){var n,r,i,o,a;for(n in e)if(r=ot.camelCase(n),i=t[r],o=e[n],ot.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=ot.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function B(e,t,n){var r,i,o=0,a=bn.length,s=ot.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;for(var t=hn||_(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:ot.extend({},t),opts:ot.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:hn||_(),duration:n.duration,tweens:[],createTween:function(t,n){var r=ot.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(F(c,u.opts.specialEasing);a>o;o++)if(r=bn[o].call(u,e,c,u.opts))return r;return ot.map(c,M,u),ot.isFunction(u.opts.start)&&u.opts.start.call(e,u),ot.fx.timer(ot.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function P(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(xt)||[];if(ot.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function R(e,t,n,r){function i(s){var l;return o[s]=!0,ot.each(e[s]||[],function(e,s){var u=s(t,n,r);return"string"!=typeof u||a||o[u]?a?!(l=u):void 0:(t.dataTypes.unshift(u),i(u),!1)}),l}var o={},a=e===In;return i(t.dataTypes[0])||!o["*"]&&i("*")}function W(e,t){var n,r,i=ot.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&ot.extend(!0,e,n),e}function z(e,t,n){for(var r,i,o,a,s=e.contents,l=e.dataTypes;"*"===l[0];)l.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){l.unshift(a);break}if(l[0]in n)o=l[0];else{for(a in n){if(!l[0]||e.converters[a+" "+l[0]]){o=a;break}r||(r=a)}o=o||r}return o?(o!==l[0]&&l.unshift(o),n[o]):void 0}function I(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(d){return{state:"parsererror",error:a?d:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}function X(e,t,n,r){var i;if(ot.isArray(t))ot.each(t,function(t,i){n||Jn.test(e)?r(e,i):X(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==ot.type(t))r(e,t);else for(i in t)X(e+"["+i+"]",t[i],n,r)}function U(){try{return new e.XMLHttpRequest}catch(t){}}function V(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function J(e){return ot.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}var Y=[],G=Y.slice,K=Y.concat,Q=Y.push,Z=Y.indexOf,et={},tt=et.toString,nt=et.hasOwnProperty,rt={},it="1.11.1",ot=function(e,t){return new ot.fn.init(e,t)},at=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,st=/^-ms-/,lt=/-([\da-z])/gi,ut=function(e,t){return t.toUpperCase()};ot.fn=ot.prototype={jquery:it,constructor:ot,selector:"",length:0,toArray:function(){return G.call(this)},get:function(e){return null!=e?0>e?this[e+this.length]:this[e]:G.call(this)},pushStack:function(e){var t=ot.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return ot.each(this,e,t)},map:function(e){return this.pushStack(ot.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(G.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:Q,sort:Y.sort,splice:Y.splice},ot.extend=ot.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,l=arguments.length,u=!1;for("boolean"==typeof a&&(u=a,a=arguments[s]||{},s++),"object"==typeof a||ot.isFunction(a)||(a={}),s===l&&(a=this,s--);l>s;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(u&&n&&(ot.isPlainObject(n)||(t=ot.isArray(n)))?(t?(t=!1,o=e&&ot.isArray(e)?e:[]):o=e&&ot.isPlainObject(e)?e:{},a[r]=ot.extend(u,o,n)):void 0!==n&&(a[r]=n));return a},ot.extend({expando:"jQuery"+(it+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===ot.type(e)},isArray:Array.isArray||function(e){return"array"===ot.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!ot.isArray(e)&&e-parseFloat(e)>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==ot.type(e)||e.nodeType||ot.isWindow(e))return!1;try{if(e.constructor&&!nt.call(e,"constructor")&&!nt.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(rt.ownLast)for(t in e)return nt.call(e,t);for(t in e);return void 0===t||nt.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?et[tt.call(e)]||"object":typeof e},globalEval:function(t){t&&ot.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(st,"ms-").replace(lt,ut)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(at,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?ot.merge(r,"string"==typeof e?[e]:e):Q.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(Z)return Z.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;n>r;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;a>o;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),l=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&l.push(i);else for(o in e)i=t(e[o],o,r),null!=i&&l.push(i);return K.apply([],l)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(i=e[t],t=e,e=i),ot.isFunction(e)?(n=G.call(arguments,2),r=function(){return e.apply(t||this,n.concat(G.call(arguments)))},r.guid=e.guid=e.guid||ot.guid++,r):void 0},now:function(){return+new Date},support:rt}),ot.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){et["[object "+t+"]"]=t.toLowerCase()});var ct=function(e){function t(e,t,n,r){var i,o,a,s,l,u,d,p,h,m;if((t?t.ownerDocument||t:R)!==H&&L(t),t=t||H,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(q&&!r){if(i=yt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&B(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return et.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&w.getElementsByClassName&&t.getElementsByClassName)return et.apply(n,t.getElementsByClassName(a)),n}if(w.qsa&&(!M||!M.test(e))){if(p=d=P,h=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(u=k(e),(d=t.getAttribute("id"))?p=d.replace(xt,"\\$&"):t.setAttribute("id",p),p="[id='"+p+"'] ",l=u.length;l--;)u[l]=p+f(u[l]);h=bt.test(e)&&c(t.parentNode)||t,m=u.join(",")}if(m)try{return et.apply(n,h.querySelectorAll(m)),n}catch(g){}finally{d||t.removeAttribute("id")}}}return S(e.replace(ut,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=e.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||Y)-(~e.sourceIndex||Y);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function u(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&typeof e.getElementsByTagName!==J&&e}function d(){}function f(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=z++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,u=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),(s=l[r])&&s[0]===W&&s[1]===o)return u[2]=s[2];if(l[r]=u,u[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function m(e,n,r){for(var i=0,o=n.length;o>i;i++)t(e,n[i],r);return r}function g(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,u=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function v(e,t,n,i,o,a){return i&&!i[P]&&(i=v(i)),o&&!o[P]&&(o=v(o,a)),r(function(r,a,s,l){var u,c,d,f=[],p=[],h=a.length,v=r||m(t||"*",s.nodeType?[s]:s,[]),y=!e||!r&&t?v:g(v,f,e,s,l),b=n?o||(r?e:h||i)?[]:a:y;if(n&&n(y,b,s,l),i)for(u=g(b,p),i(u,[],s,l),c=u.length;c--;)(d=u[c])&&(b[p[c]]=!(y[p[c]]=d));if(r){if(o||e){if(o){for(u=[],c=b.length;c--;)(d=b[c])&&u.push(y[c]=d);o(null,b=[],u,l)}for(c=b.length;c--;)(d=b[c])&&(u=o?nt.call(r,d):f[c])>-1&&(r[u]=!(a[u]=d))}}else b=g(b===a?b.splice(h,b.length):b),o?o(null,a,b,l):et.apply(a,b)})}function y(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,l=p(function(e){return e===t},a,!0),u=p(function(e){return nt.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==j)||((t=n).nodeType?l(e,n,r):u(e,n,r))}];i>s;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!T.relative[e[r].type];r++);return v(s>1&&h(c),s>1&&f(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ut,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&f(e))}c.push(n)}return h(c)}function b(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,l,u){var c,d,f,p=0,h="0",m=r&&[],v=[],y=j,b=r||o&&T.find.TAG("*",u),x=W+=null==y?1:Math.random()||.1,w=b.length;for(u&&(j=a!==H&&a);h!==w&&null!=(c=b[h]);h++){if(o&&c){for(d=0;f=e[d++];)if(f(c,a,s)){l.push(c);break}u&&(W=x)}i&&((c=!f&&c)&&p--,r&&m.push(c))}if(p+=h,i&&h!==p){for(d=0;f=n[d++];)f(m,v,a,s);if(r){if(p>0)for(;h--;)m[h]||v[h]||(v[h]=Q.call(l));v=g(v)}et.apply(l,v),u&&!r&&v.length>0&&p+n.length>1&&t.uniqueSort(l)}return u&&(W=x,j=y),m};return i?r(a):a}var x,w,T,C,N,k,E,S,j,D,A,L,H,_,q,M,O,F,B,P="sizzle"+-new Date,R=e.document,W=0,z=0,I=n(),X=n(),U=n(),V=function(e,t){return e===t&&(A=!0),0},J="undefined",Y=1<<31,G={}.hasOwnProperty,K=[],Q=K.pop,Z=K.push,et=K.push,tt=K.slice,nt=K.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},rt="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",it="[\\x20\\t\\r\\n\\f]",ot="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",at=ot.replace("w","w#"),st="\\["+it+"*("+ot+")(?:"+it+"*([*^$|!~]?=)"+it+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+at+"))|)"+it+"*\\]",lt=":("+ot+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+st+")*)|.*)\\)|)",ut=new RegExp("^"+it+"+|((?:^|[^\\\\])(?:\\\\.)*)"+it+"+$","g"),ct=new RegExp("^"+it+"*,"+it+"*"),dt=new RegExp("^"+it+"*([>+~]|"+it+")"+it+"*"),ft=new RegExp("="+it+"*([^\\]'\"]*?)"+it+"*\\]","g"),pt=new RegExp(lt),ht=new RegExp("^"+at+"$"),mt={ID:new RegExp("^#("+ot+")"),CLASS:new RegExp("^\\.("+ot+")"),TAG:new RegExp("^("+ot.replace("w","w*")+")"),ATTR:new RegExp("^"+st),PSEUDO:new RegExp("^"+lt),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+it+"*(even|odd|(([+-]|)(\\d*)n|)"+it+"*(?:([+-]|)"+it+"*(\\d+)|))"+it+"*\\)|)","i"),bool:new RegExp("^(?:"+rt+")$","i"),needsContext:new RegExp("^"+it+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+it+"*((?:-\\d)?\\d*)"+it+"*\\)|)(?=[^-]|$)","i")},gt=/^(?:input|select|textarea|button)$/i,vt=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,yt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,bt=/[+~]/,xt=/'|\\/g,wt=new RegExp("\\\\([\\da-f]{1,6}"+it+"?|("+it+")|.)","ig"),Tt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{et.apply(K=tt.call(R.childNodes),R.childNodes),K[R.childNodes.length].nodeType}catch(Ct){et={apply:K.length?function(e,t){Z.apply(e,tt.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},N=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},L=t.setDocument=function(e){var t,n=e?e.ownerDocument||e:R,r=n.defaultView;return n!==H&&9===n.nodeType&&n.documentElement?(H=n,_=n.documentElement,q=!N(n),r&&r!==r.top&&(r.addEventListener?r.addEventListener("unload",function(){L()},!1):r.attachEvent&&r.attachEvent("onunload",function(){L()})),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=$.test(n.getElementsByClassName)&&i(function(e){return e.innerHTML="",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),w.getById=i(function(e){return _.appendChild(e).id=P,!n.getElementsByName||!n.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if(typeof t.getElementById!==J&&q){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},T.filter.ID=function(e){var t=e.replace(wt,Tt);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(wt,Tt);return function(e){var n=typeof e.getAttributeNode!==J&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==J?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==J&&q?t.getElementsByClassName(e):void 0},O=[],M=[],(w.qsa=$.test(n.querySelectorAll))&&(i(function(e){e.innerHTML="",e.querySelectorAll("[msallowclip^='']").length&&M.push("[*^$]="+it+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||M.push("\\["+it+"*(?:value|"+rt+")"),e.querySelectorAll(":checked").length||M.push(":checked")}),i(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&M.push("name"+it+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||M.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),M.push(",.*:")})),(w.matchesSelector=$.test(F=_.matches||_.webkitMatchesSelector||_.mozMatchesSelector||_.oMatchesSelector||_.msMatchesSelector))&&i(function(e){w.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),O.push("!=",lt)}),M=M.length&&new RegExp(M.join("|")),O=O.length&&new RegExp(O.join("|")),t=$.test(_.compareDocumentPosition),B=t||$.test(_.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},V=t?function(e,t){if(e===t)return A=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r?r:(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&r||!w.sortDetached&&t.compareDocumentPosition(e)===r?e===n||e.ownerDocument===R&&B(R,e)?-1:t===n||t.ownerDocument===R&&B(R,t)?1:D?nt.call(D,e)-nt.call(D,t):0:4&r?-1:1)}:function(e,t){if(e===t)return A=!0,0;var r,i=0,o=e.parentNode,s=t.parentNode,l=[e],u=[t];if(!o||!s)return e===n?-1:t===n?1:o?-1:s?1:D?nt.call(D,e)-nt.call(D,t):0;if(o===s)return a(e,t);for(r=e;r=r.parentNode;)l.unshift(r);for(r=t;r=r.parentNode;)u.unshift(r);for(;l[i]===u[i];)i++;return i?a(l[i],u[i]):l[i]===R?-1:u[i]===R?1:0},n):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ft,"='$1']"),!(!w.matchesSelector||!q||O&&O.test(n)||M&&M.test(n)))try{var r=F.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),B(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&G.call(T.attrHandle,t.toLowerCase())?n(e,t,!q):void 0;return void 0!==r?r:w.attributes||!q?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(A=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(V),A){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:mt,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(wt,Tt),e[3]=(e[3]||e[4]||e[5]||"").replace(wt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return mt.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&pt.test(n)&&(t=k(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(wt,Tt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=I[e+" "];return t||(t=new RegExp("(^|"+it+")"+e+"("+it+"|$)"))&&I(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==J&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:n?(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o+" ").indexOf(r)>-1:"|="===n?o===r||o.slice(0,r.length+1)===r+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(c=g[P]||(g[P]={}),u=c[e]||[],p=u[0]===W&&u[1],f=u[0]===W&&u[2],d=p&&g.childNodes[p];d=++p&&d&&d[m]||(f=p=0)||h.pop();)if(1===d.nodeType&&++f&&d===t){c[e]=[W,p,f];break}}else if(y&&(u=(t[P]||(t[P]={}))[e])&&u[0]===W)f=u[1];else for(;(d=++p&&d&&d[m]||(f=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[P]||(d[P]={}))[e]=[W,f]),d!==t)););return f-=i,f===r||f%r===0&&f/r>=0
+}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=nt.call(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=E(e.replace(ut,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return ht.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(wt,Tt).toLowerCase(),function(t){var n;do if(n=q?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===_},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return vt.test(e.nodeName)},input:function(e){return gt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:u(function(){return[0]}),last:u(function(e,t){return[t-1]}),eq:u(function(e,t,n){return[0>n?n+t:n]}),even:u(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:u(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:u(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:u(function(e,t,n){for(var r=0>n?n+t:n;++r2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&q&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(wt,Tt),t)||[])[0],!t)return n;u&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=mt.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((l=T.find[s])&&(r=l(a.matches[0].replace(wt,Tt),bt.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&f(o),!e)return et.apply(n,r),n;break}}return(u||E(e,d))(r,t,!q,n,bt.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(V).join("")===P,w.detectDuplicates=!!A,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){return n?void 0:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?void 0:e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(rt,function(e,t,n){var r;return n?void 0:e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);ot.find=ct,ot.expr=ct.selectors,ot.expr[":"]=ot.expr.pseudos,ot.unique=ct.uniqueSort,ot.text=ct.getText,ot.isXMLDoc=ct.isXML,ot.contains=ct.contains;var dt=ot.expr.match.needsContext,ft=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,pt=/^.[^:#\[\.,]*$/;ot.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ot.find.matchesSelector(r,e)?[r]:[]:ot.find.matches(e,ot.grep(t,function(e){return 1===e.nodeType}))},ot.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(ot(e).filter(function(){for(t=0;i>t;t++)if(ot.contains(r[t],this))return!0}));for(t=0;i>t;t++)ot.find(e,r[t],n);return n=this.pushStack(i>1?ot.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&dt.test(e)?ot(e):e||[],!1).length}});var ht,mt=e.document,gt=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,vt=ot.fn.init=function(e,t){var n,r;if(!e)return this;if("string"==typeof e){if(n="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:gt.exec(e),!n||!n[1]&&t)return!t||t.jquery?(t||ht).find(e):this.constructor(t).find(e);if(n[1]){if(t=t instanceof ot?t[0]:t,ot.merge(this,ot.parseHTML(n[1],t&&t.nodeType?t.ownerDocument||t:mt,!0)),ft.test(n[1])&&ot.isPlainObject(t))for(n in t)ot.isFunction(this[n])?this[n](t[n]):this.attr(n,t[n]);return this}if(r=mt.getElementById(n[2]),r&&r.parentNode){if(r.id!==n[2])return ht.find(e);this.length=1,this[0]=r}return this.context=mt,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):ot.isFunction(e)?"undefined"!=typeof ht.ready?ht.ready(e):e(ot):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),ot.makeArray(e,this))};vt.prototype=ot.fn,ht=ot(mt);var yt=/^(?:parents|prev(?:Until|All))/,bt={children:!0,contents:!0,next:!0,prev:!0};ot.extend({dir:function(e,t,n){for(var r=[],i=e[t];i&&9!==i.nodeType&&(void 0===n||1!==i.nodeType||!ot(i).is(n));)1===i.nodeType&&r.push(i),i=i[t];return r},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}}),ot.fn.extend({has:function(e){var t,n=ot(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(ot.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=dt.test(e)||"string"!=typeof e?ot(e,t||this.context):0;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&ot.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?ot.unique(o):o)},index:function(e){return e?"string"==typeof e?ot.inArray(this[0],ot(e)):ot.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ot.unique(ot.merge(this.get(),ot(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ot.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return ot.dir(e,"parentNode")},parentsUntil:function(e,t,n){return ot.dir(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return ot.dir(e,"nextSibling")},prevAll:function(e){return ot.dir(e,"previousSibling")},nextUntil:function(e,t,n){return ot.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return ot.dir(e,"previousSibling",n)},siblings:function(e){return ot.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return ot.sibling(e.firstChild)},contents:function(e){return ot.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:ot.merge([],e.childNodes)}},function(e,t){ot.fn[e]=function(n,r){var i=ot.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=ot.filter(r,i)),this.length>1&&(bt[e]||(i=ot.unique(i)),yt.test(e)&&(i=i.reverse())),this.pushStack(i)}});var xt=/\S+/g,wt={};ot.Callbacks=function(e){e="string"==typeof e?wt[e]||o(e):ot.extend({},e);var t,n,r,i,a,s,l=[],u=!e.once&&[],c=function(o){for(n=e.memory&&o,r=!0,a=s||0,s=0,i=l.length,t=!0;l&&i>a;a++)if(l[a].apply(o[0],o[1])===!1&&e.stopOnFalse){n=!1;break}t=!1,l&&(u?u.length&&c(u.shift()):n?l=[]:d.disable())},d={add:function(){if(l){var r=l.length;!function o(t){ot.each(t,function(t,n){var r=ot.type(n);"function"===r?e.unique&&d.has(n)||l.push(n):n&&n.length&&"string"!==r&&o(n)})}(arguments),t?i=l.length:n&&(s=r,c(n))}return this},remove:function(){return l&&ot.each(arguments,function(e,n){for(var r;(r=ot.inArray(n,l,r))>-1;)l.splice(r,1),t&&(i>=r&&i--,a>=r&&a--)}),this},has:function(e){return e?ot.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],i=0,this},disable:function(){return l=u=n=void 0,this},disabled:function(){return!l},lock:function(){return u=void 0,n||d.disable(),this},locked:function(){return!u},fireWith:function(e,n){return!l||r&&!u||(n=n||[],n=[e,n.slice?n.slice():n],t?u.push(n):c(n)),this},fire:function(){return d.fireWith(this,arguments),this},fired:function(){return!!r}};return d},ot.extend({Deferred:function(e){var t=[["resolve","done",ot.Callbacks("once memory"),"resolved"],["reject","fail",ot.Callbacks("once memory"),"rejected"],["notify","progress",ot.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return ot.Deferred(function(n){ot.each(t,function(t,o){var a=ot.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&ot.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?ot.extend(e,r):r}},i={};return r.pipe=r.then,ot.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=G.call(arguments),r=n.length,i=1!==r||e&&ot.isFunction(e.promise)?r:0,o=1===i?e:ot.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?G.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=new Array(r),l=new Array(r),u=new Array(r);r>t;t++)n[t]&&ot.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}});var Tt;ot.fn.ready=function(e){return ot.ready.promise().done(e),this},ot.extend({isReady:!1,readyWait:1,holdReady:function(e){e?ot.readyWait++:ot.ready(!0)},ready:function(e){if(e===!0?!--ot.readyWait:!ot.isReady){if(!mt.body)return setTimeout(ot.ready);ot.isReady=!0,e!==!0&&--ot.readyWait>0||(Tt.resolveWith(mt,[ot]),ot.fn.triggerHandler&&(ot(mt).triggerHandler("ready"),ot(mt).off("ready")))}}}),ot.ready.promise=function(t){if(!Tt)if(Tt=ot.Deferred(),"complete"===mt.readyState)setTimeout(ot.ready);else if(mt.addEventListener)mt.addEventListener("DOMContentLoaded",s,!1),e.addEventListener("load",s,!1);else{mt.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&mt.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!ot.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}a(),ot.ready()}}()}return Tt.promise(t)};var Ct="undefined",Nt;for(Nt in ot(rt))break;rt.ownLast="0"!==Nt,rt.inlineBlockNeedsLayout=!1,ot(function(){var e,t,n,r;n=mt.getElementsByTagName("body")[0],n&&n.style&&(t=mt.createElement("div"),r=mt.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),typeof t.style.zoom!==Ct&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",rt.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=mt.createElement("div");if(null==rt.deleteExpando){rt.deleteExpando=!0;try{delete e.test}catch(t){rt.deleteExpando=!1}}e=null}(),ot.acceptData=function(e){var t=ot.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return 1!==n&&9!==n?!1:!t||t!==!0&&e.getAttribute("classid")===t};var kt=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Et=/([A-Z])/g;ot.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?ot.cache[e[ot.expando]]:e[ot.expando],!!e&&!u(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return d(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return d(e,t,!0)}}),ot.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=ot.data(o),1===o.nodeType&&!ot._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=ot.camelCase(r.slice(5)),l(o,r,i[r])));ot._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){ot.data(this,e)}):arguments.length>1?this.each(function(){ot.data(this,e,t)}):o?l(o,e,ot.data(o,e)):void 0},removeData:function(e){return this.each(function(){ot.removeData(this,e)})}}),ot.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=ot._data(e,t),n&&(!r||ot.isArray(n)?r=ot._data(e,t,ot.makeArray(n)):r.push(n)),r||[]):void 0},dequeue:function(e,t){t=t||"fx";var n=ot.queue(e,t),r=n.length,i=n.shift(),o=ot._queueHooks(e,t),a=function(){ot.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return ot._data(e,n)||ot._data(e,n,{empty:ot.Callbacks("once memory").add(function(){ot._removeData(e,t+"queue"),ot._removeData(e,n)})})}}),ot.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.lengths;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:u?t.call(e):l?t(e[0],n):o},Lt=/^(?:checkbox|radio)$/i;!function(){var e=mt.createElement("input"),t=mt.createElement("div"),n=mt.createDocumentFragment();if(t.innerHTML="
a",rt.leadingWhitespace=3===t.firstChild.nodeType,rt.tbody=!t.getElementsByTagName("tbody").length,rt.htmlSerialize=!!t.getElementsByTagName("link").length,rt.html5Clone="<:nav>"!==mt.createElement("nav").cloneNode(!0).outerHTML,e.type="checkbox",e.checked=!0,n.appendChild(e),rt.appendChecked=e.checked,t.innerHTML="",rt.noCloneChecked=!!t.cloneNode(!0).lastChild.defaultValue,n.appendChild(t),t.innerHTML="",rt.checkClone=t.cloneNode(!0).cloneNode(!0).lastChild.checked,rt.noCloneEvent=!0,t.attachEvent&&(t.attachEvent("onclick",function(){rt.noCloneEvent=!1}),t.cloneNode(!0).click()),null==rt.deleteExpando){rt.deleteExpando=!0;try{delete t.test}catch(r){rt.deleteExpando=!1}}}(),function(){var t,n,r=mt.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(rt[t+"Bubbles"]=n in e)||(r.setAttribute(n,"t"),rt[t+"Bubbles"]=r.attributes[n].expando===!1);r=null}();var Ht=/^(?:input|select|textarea)$/i,_t=/^key/,$t=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,qt=/^([^.]*)(?:\.(.+)|)$/;ot.event={global:{},add:function(e,t,n,r,i){var o,a,s,l,u,c,d,f,p,h,m,g=ot._data(e);if(g){for(n.handler&&(l=n,n=l.handler,i=l.selector),n.guid||(n.guid=ot.guid++),(a=g.events)||(a=g.events={}),(c=g.handle)||(c=g.handle=function(e){return typeof ot===Ct||e&&ot.event.triggered===e.type?void 0:ot.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(xt)||[""],s=t.length;s--;)o=qt.exec(t[s])||[],p=m=o[1],h=(o[2]||"").split(".").sort(),p&&(u=ot.event.special[p]||{},p=(i?u.delegateType:u.bindType)||p,u=ot.event.special[p]||{},d=ot.extend({type:p,origType:m,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ot.expr.match.needsContext.test(i),namespace:h.join(".")},l),(f=a[p])||(f=a[p]=[],f.delegateCount=0,u.setup&&u.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),u.add&&(u.add.call(e,d),d.handler.guid||(d.handler.guid=n.guid)),i?f.splice(f.delegateCount++,0,d):f.push(d),ot.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,d,f,p,h,m,g=ot.hasData(e)&&ot._data(e);if(g&&(c=g.events)){for(t=(t||"").match(xt)||[""],u=t.length;u--;)if(s=qt.exec(t[u])||[],p=m=s[1],h=(s[2]||"").split(".").sort(),p){for(d=ot.event.special[p]||{},p=(r?d.delegateType:d.bindType)||p,f=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;o--;)a=f[o],!i&&m!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,d.remove&&d.remove.call(e,a));l&&!f.length&&(d.teardown&&d.teardown.call(e,h,g.handle)!==!1||ot.removeEvent(e,p,g.handle),delete c[p])}else for(p in c)ot.event.remove(e,p+t[u],n,r,!0);ot.isEmptyObject(c)&&(delete g.handle,ot._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,l,u,c,d,f=[r||mt],p=nt.call(t,"type")?t.type:t,h=nt.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||mt,3!==r.nodeType&&8!==r.nodeType&&!$.test(p+ot.event.triggered)&&(p.indexOf(".")>=0&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[ot.expando]?t:new ot.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.namespace_re=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:ot.makeArray(n,[t]),u=ot.event.special[p]||{},i||!u.trigger||u.trigger.apply(r,n)!==!1)){if(!i&&!u.noBubble&&!ot.isWindow(r)){for(l=u.delegateType||p,$.test(l+p)||(s=s.parentNode);s;s=s.parentNode)f.push(s),c=s;c===(r.ownerDocument||mt)&&f.push(c.defaultView||c.parentWindow||e)}for(d=0;(s=f[d++])&&!t.isPropagationStopped();)t.type=d>1?l:u.bindType||p,o=(ot._data(s,"events")||{})[t.type]&&ot._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&ot.acceptData(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!u._default||u._default.apply(f.pop(),n)===!1)&&ot.acceptData(r)&&a&&r[p]&&!ot.isWindow(r)){c=r[a],c&&(r[a]=null),ot.event.triggered=p;try{r[p]()}catch(m){}ot.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=ot.event.fix(e);var t,n,r,i,o,a=[],s=G.call(arguments),l=(ot._data(this,"events")||{})[e.type]||[],u=ot.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!u.preDispatch||u.preDispatch.call(this,e)!==!1){for(a=ot.event.handlers.call(this,e,l),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,o=0;(r=i.handlers[o++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re||e.namespace_re.test(r.namespace))&&(e.handleObj=r,e.data=r.data,n=((ot.event.special[r.origType]||{}).handle||r.handler).apply(i.elem,s),void 0!==n&&(e.result=n)===!1&&(e.preventDefault(),e.stopPropagation()));return u.postDispatch&&u.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,l=e.target;if(s&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(i=[],o=0;s>o;o++)r=t[o],n=r.selector+" ",void 0===i[n]&&(i[n]=r.needsContext?ot(n,this).index(l)>=0:ot.find(n,this,null,[l]).length),i[n]&&i.push(r);i.length&&a.push({elem:l,handlers:i})}return s","
"],tr:[2,"","
"],col:[2,"
"],td:[3,"
"],_default:rt.htmlSerialize?[0,"",""]:[1,"X"!==c[1]||Wt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;i--;)ot.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u);for(ot.merge(p,s.childNodes),s.textContent="";s.firstChild;)s.removeChild(s.firstChild);s=f.lastChild}else p.push(t.createTextNode(o));for(s&&f.removeChild(s),rt.appendChecked||ot.grep(g(p,"input"),v),h=0;o=p[h++];)if((!r||-1===ot.inArray(o,r))&&(a=ot.contains(o.ownerDocument,o),s=g(f.appendChild(o),"script"),a&&w(s),n))for(i=0;o=s[i++];)Ut.test(o.type||"")&&n.push(o);return s=null,f},cleanData:function(e,t){for(var n,r,i,o,a=0,s=ot.expando,l=ot.cache,u=rt.deleteExpando,c=ot.event.special;null!=(n=e[a]);a++)if((t||ot.acceptData(n))&&(i=n[s],o=i&&l[i])){if(o.events)for(r in o.events)c[r]?ot.event.remove(n,r):ot.removeEvent(n,r,o.handle);l[i]&&(delete l[i],u?delete n[s]:typeof n.removeAttribute!==Ct?n.removeAttribute(s):n[s]=null,Y.push(i))}}}),ot.fn.extend({text:function(e){return At(this,function(e){return void 0===e?ot.text(this):this.empty().append((this[0]&&this[0].ownerDocument||mt).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=y(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=y(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){for(var n,r=e?ot.filter(e,this):this,i=0;null!=(n=r[i]);i++)t||1!==n.nodeType||ot.cleanData(g(n)),n.parentNode&&(t&&ot.contains(n.ownerDocument,n)&&w(g(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&ot.cleanData(g(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&ot.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return ot.clone(this,e,t)
+})},html:function(e){return At(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ot,""):void 0;if(!("string"!=typeof e||It.test(e)||!rt.htmlSerialize&&Ft.test(e)||!rt.leadingWhitespace&&Bt.test(e)||Yt[(Rt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(Pt,"<$1>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(ot.cleanData(g(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=arguments[0];return this.domManip(arguments,function(t){e=this.parentNode,ot.cleanData(g(this)),e&&e.replaceChild(t,this)}),e&&(e.length||e.nodeType)?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t){e=K.apply([],e);var n,r,i,o,a,s,l=0,u=this.length,c=this,d=u-1,f=e[0],p=ot.isFunction(f);if(p||u>1&&"string"==typeof f&&!rt.checkClone&&Xt.test(f))return this.each(function(n){var r=c.eq(n);p&&(e[0]=f.call(this,n,r.html())),r.domManip(e,t)});if(u&&(s=ot.buildFragment(e,this[0].ownerDocument,!1,this),n=s.firstChild,1===s.childNodes.length&&(s=n),n)){for(o=ot.map(g(s,"script"),b),i=o.length;u>l;l++)r=s,l!==d&&(r=ot.clone(r,!0,!0),i&&ot.merge(o,g(r,"script"))),t.call(this[l],r,l);if(i)for(a=o[o.length-1].ownerDocument,ot.map(o,x),l=0;i>l;l++)r=o[l],Ut.test(r.type||"")&&!ot._data(r,"globalEval")&&ot.contains(a,r)&&(r.src?ot._evalUrl&&ot._evalUrl(r.src):ot.globalEval((r.text||r.textContent||r.innerHTML||"").replace(Jt,"")));s=n=null}return this}}),ot.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){ot.fn[e]=function(e){for(var n,r=0,i=[],o=ot(e),a=o.length-1;a>=r;r++)n=r===a?this:this.clone(!0),ot(o[r])[t](n),Q.apply(i,n.get());return this.pushStack(i)}});var Qt,Zt={};!function(){var e;rt.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=mt.getElementsByTagName("body")[0],n&&n.style?(t=mt.createElement("div"),r=mt.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),typeof t.style.zoom!==Ct&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(mt.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var en=/^margin/,tn=new RegExp("^("+St+")(?!px)[a-z%]+$","i"),nn,rn,on=/^(top|right|bottom|left)$/;e.getComputedStyle?(nn=function(e){return e.ownerDocument.defaultView.getComputedStyle(e,null)},rn=function(e,t,n){var r,i,o,a,s=e.style;return n=n||nn(e),a=n?n.getPropertyValue(t)||n[t]:void 0,n&&(""!==a||ot.contains(e.ownerDocument,e)||(a=ot.style(e,t)),tn.test(a)&&en.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0===a?a:a+""}):mt.documentElement.currentStyle&&(nn=function(e){return e.currentStyle},rn=function(e,t,n){var r,i,o,a,s=e.style;return n=n||nn(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),tn.test(a)&&!on.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"}),!function(){function t(){var t,n,r,i;n=mt.getElementsByTagName("body")[0],n&&n.style&&(t=mt.createElement("div"),r=mt.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),t.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",o=a=!1,l=!0,e.getComputedStyle&&(o="1%"!==(e.getComputedStyle(t,null)||{}).top,a="4px"===(e.getComputedStyle(t,null)||{width:"4px"}).width,i=t.appendChild(mt.createElement("div")),i.style.cssText=t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",t.style.width="1px",l=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight)),t.innerHTML="
",i=t.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",s=0===i[0].offsetHeight,s&&(i[0].style.display="",i[1].style.display="none",s=0===i[0].offsetHeight),n.removeChild(r))}var n,r,i,o,a,s,l;n=mt.createElement("div"),n.innerHTML="
a",i=n.getElementsByTagName("a")[0],(r=i&&i.style)&&(r.cssText="float:left;opacity:.5",rt.opacity="0.5"===r.opacity,rt.cssFloat=!!r.cssFloat,n.style.backgroundClip="content-box",n.cloneNode(!0).style.backgroundClip="",rt.clearCloneStyle="content-box"===n.style.backgroundClip,rt.boxSizing=""===r.boxSizing||""===r.MozBoxSizing||""===r.WebkitBoxSizing,ot.extend(rt,{reliableHiddenOffsets:function(){return null==s&&t(),s},boxSizingReliable:function(){return null==a&&t(),a},pixelPosition:function(){return null==o&&t(),o},reliableMarginRight:function(){return null==l&&t(),l}}))}(),ot.swap=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i};var an=/alpha\([^)]*\)/i,sn=/opacity\s*=\s*([^)]*)/,ln=/^(none|table(?!-c[ea]).+)/,un=new RegExp("^("+St+")(.*)$","i"),cn=new RegExp("^([+-])=("+St+")","i"),dn={position:"absolute",visibility:"hidden",display:"block"},fn={letterSpacing:"0",fontWeight:"400"},pn=["Webkit","O","Moz","ms"];ot.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=rn(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":rt.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=ot.camelCase(t),l=e.style;if(t=ot.cssProps[s]||(ot.cssProps[s]=S(l,s)),a=ot.cssHooks[t]||ot.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];if(o=typeof n,"string"===o&&(i=cn.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(ot.css(e,t)),o="number"),null!=n&&n===n&&("number"!==o||ot.cssNumber[s]||(n+="px"),rt.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{l[t]=n}catch(u){}}},css:function(e,t,n,r){var i,o,a,s=ot.camelCase(t);return t=ot.cssProps[s]||(ot.cssProps[s]=S(e.style,s)),a=ot.cssHooks[t]||ot.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=rn(e,t,r)),"normal"===o&&t in fn&&(o=fn[t]),""===n||n?(i=parseFloat(o),n===!0||ot.isNumeric(i)?i||0:o):o}}),ot.each(["height","width"],function(e,t){ot.cssHooks[t]={get:function(e,n,r){return n?ln.test(ot.css(e,"display"))&&0===e.offsetWidth?ot.swap(e,dn,function(){return L(e,t,r)}):L(e,t,r):void 0},set:function(e,n,r){var i=r&&nn(e);return D(e,n,r?A(e,t,r,rt.boxSizing&&"border-box"===ot.css(e,"boxSizing",!1,i),i):0)}}}),rt.opacity||(ot.cssHooks.opacity={get:function(e,t){return sn.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=ot.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===ot.trim(o.replace(an,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=an.test(o)?o.replace(an,i):o+" "+i)}}),ot.cssHooks.marginRight=E(rt.reliableMarginRight,function(e,t){return t?ot.swap(e,{display:"inline-block"},rn,[e,"marginRight"]):void 0}),ot.each({margin:"",padding:"",border:"Width"},function(e,t){ot.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];4>r;r++)i[e+jt[r]+t]=o[r]||o[r-2]||o[0];return i}},en.test(e)||(ot.cssHooks[e+t].set=D)}),ot.fn.extend({css:function(e,t){return At(this,function(e,t,n){var r,i,o={},a=0;if(ot.isArray(t)){for(r=nn(e),i=t.length;i>a;a++)o[t[a]]=ot.css(e,t[a],!1,r);return o}return void 0!==n?ot.style(e,t,n):ot.css(e,t)},e,t,arguments.length>1)},show:function(){return j(this,!0)},hide:function(){return j(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Dt(this)?ot(this).show():ot(this).hide()})}}),ot.Tween=H,H.prototype={constructor:H,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ot.cssNumber[n]?"":"px")},cur:function(){var e=H.propHooks[this.prop];return e&&e.get?e.get(this):H.propHooks._default.get(this)},run:function(e){var t,n=H.propHooks[this.prop];return this.pos=t=this.options.duration?ot.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):H.propHooks._default.set(this),this}},H.prototype.init.prototype=H.prototype,H.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=ot.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){ot.fx.step[e.prop]?ot.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[ot.cssProps[e.prop]]||ot.cssHooks[e.prop])?ot.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},H.propHooks.scrollTop=H.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ot.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},ot.fx=H.prototype.init,ot.fx.step={};var hn,mn,gn=/^(?:toggle|show|hide)$/,vn=new RegExp("^(?:([+-])=|)("+St+")([a-z%]*)$","i"),yn=/queueHooks$/,bn=[O],xn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=vn.exec(t),o=i&&i[3]||(ot.cssNumber[e]?"":"px"),a=(ot.cssNumber[e]||"px"!==o&&+r)&&vn.exec(ot.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,ot.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};ot.Animation=ot.extend(B,{tweener:function(e,t){ot.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");for(var n,r=0,i=e.length;i>r;r++)n=e[r],xn[n]=xn[n]||[],xn[n].unshift(t)},prefilter:function(e,t){t?bn.unshift(e):bn.push(e)}}),ot.speed=function(e,t,n){var r=e&&"object"==typeof e?ot.extend({},e):{complete:n||!n&&t||ot.isFunction(e)&&e,duration:e,easing:n&&t||t&&!ot.isFunction(t)&&t};return r.duration=ot.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in ot.fx.speeds?ot.fx.speeds[r.duration]:ot.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){ot.isFunction(r.old)&&r.old.call(this),r.queue&&ot.dequeue(this,r.queue)},r},ot.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Dt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=ot.isEmptyObject(e),o=ot.speed(t,n,r),a=function(){var t=B(this,ot.extend({},e),o);(i||ot._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=ot.timers,a=ot._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&yn.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));(t||!n)&&ot.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=ot._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=ot.timers,a=r?r.length:0;for(n.finish=!0,ot.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),ot.each(["toggle","show","hide"],function(e,t){var n=ot.fn[t];ot.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(q(t,!0),e,r,i)}}),ot.each({slideDown:q("show"),slideUp:q("hide"),slideToggle:q("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){ot.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),ot.timers=[],ot.fx.tick=function(){var e,t=ot.timers,n=0;for(hn=ot.now();n
a",r=t.getElementsByTagName("a")[0],n=mt.createElement("select"),i=n.appendChild(mt.createElement("option")),e=t.getElementsByTagName("input")[0],r.style.cssText="top:1px",rt.getSetAttribute="t"!==t.className,rt.style=/top/.test(r.getAttribute("style")),rt.hrefNormalized="/a"===r.getAttribute("href"),rt.checkOn=!!e.value,rt.optSelected=i.selected,rt.enctype=!!mt.createElement("form").enctype,n.disabled=!0,rt.optDisabled=!i.disabled,e=mt.createElement("input"),e.setAttribute("value",""),rt.input=""===e.getAttribute("value"),e.value="t",e.setAttribute("type","radio"),rt.radioValue="t"===e.value}();var wn=/\r/g;ot.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=ot.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,ot(this).val()):e,null==i?i="":"number"==typeof i?i+="":ot.isArray(i)&&(i=ot.map(i,function(e){return null==e?"":e+""})),t=ot.valHooks[this.type]||ot.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))})):i?(t=ot.valHooks[i.type]||ot.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(wn,""):null==n?"":n)):void 0}}),ot.extend({valHooks:{option:{get:function(e){var t=ot.find.attr(e,"value");return null!=t?t:ot.trim(ot.text(e))}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(rt.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&ot.nodeName(n.parentNode,"optgroup"))){if(t=ot(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=ot.makeArray(t),a=i.length;a--;)if(r=i[a],ot.inArray(ot.valHooks.option.get(r),o)>=0)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),ot.each(["radio","checkbox"],function(){ot.valHooks[this]={set:function(e,t){return ot.isArray(t)?e.checked=ot.inArray(ot(e).val(),t)>=0:void 0}},rt.checkOn||(ot.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Tn,Cn,Nn=ot.expr.attrHandle,kn=/^(?:checked|selected)$/i,En=rt.getSetAttribute,Sn=rt.input;ot.fn.extend({attr:function(e,t){return At(this,ot.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){ot.removeAttr(this,e)})}}),ot.extend({attr:function(e,t,n){var r,i,o=e.nodeType;return e&&3!==o&&8!==o&&2!==o?typeof e.getAttribute===Ct?ot.prop(e,t,n):(1===o&&ot.isXMLDoc(e)||(t=t.toLowerCase(),r=ot.attrHooks[t]||(ot.expr.match.bool.test(t)?Cn:Tn)),void 0===n?r&&"get"in r&&null!==(i=r.get(e,t))?i:(i=ot.find.attr(e,t),null==i?void 0:i):null!==n?r&&"set"in r&&void 0!==(i=r.set(e,n,t))?i:(e.setAttribute(t,n+""),n):void ot.removeAttr(e,t)):void 0},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(xt);if(o&&1===e.nodeType)for(;n=o[i++];)r=ot.propFix[n]||n,ot.expr.match.bool.test(n)?Sn&&En||!kn.test(n)?e[r]=!1:e[ot.camelCase("default-"+n)]=e[r]=!1:ot.attr(e,n,""),e.removeAttribute(En?n:r)},attrHooks:{type:{set:function(e,t){if(!rt.radioValue&&"radio"===t&&ot.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}}}),Cn={set:function(e,t,n){return t===!1?ot.removeAttr(e,n):Sn&&En||!kn.test(n)?e.setAttribute(!En&&ot.propFix[n]||n,n):e[ot.camelCase("default-"+n)]=e[n]=!0,n}},ot.each(ot.expr.match.bool.source.match(/\w+/g),function(e,t){var n=Nn[t]||ot.find.attr;Nn[t]=Sn&&En||!kn.test(t)?function(e,t,r){var i,o;return r||(o=Nn[t],Nn[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,Nn[t]=o),i}:function(e,t,n){return n?void 0:e[ot.camelCase("default-"+t)]?t.toLowerCase():null}}),Sn&&En||(ot.attrHooks.value={set:function(e,t,n){return ot.nodeName(e,"input")?void(e.defaultValue=t):Tn&&Tn.set(e,t,n)}}),En||(Tn={set:function(e,t,n){var r=e.getAttributeNode(n);return r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n)?t:void 0}},Nn.id=Nn.name=Nn.coords=function(e,t,n){var r;return n?void 0:(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},ot.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:void 0},set:Tn.set},ot.attrHooks.contenteditable={set:function(e,t,n){Tn.set(e,""===t?!1:t,n)}},ot.each(["width","height"],function(e,t){ot.attrHooks[t]={set:function(e,n){return""===n?(e.setAttribute(t,"auto"),n):void 0}}})),rt.style||(ot.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var jn=/^(?:input|select|textarea|button|object)$/i,Dn=/^(?:a|area)$/i;ot.fn.extend({prop:function(e,t){return At(this,ot.prop,e,t,arguments.length>1)},removeProp:function(e){return e=ot.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),ot.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,a=e.nodeType;return e&&3!==a&&8!==a&&2!==a?(o=1!==a||!ot.isXMLDoc(e),o&&(t=ot.propFix[t]||t,i=ot.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]):void 0},propHooks:{tabIndex:{get:function(e){var t=ot.find.attr(e,"tabindex");return t?parseInt(t,10):jn.test(e.nodeName)||Dn.test(e.nodeName)&&e.href?0:-1}}}}),rt.hrefNormalized||ot.each(["href","src"],function(e,t){ot.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),rt.optSelected||(ot.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),ot.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ot.propFix[this.toLowerCase()]=this}),rt.enctype||(ot.propFix.enctype="encoding");var An=/[\t\r\n\f]/g;ot.fn.extend({addClass:function(e){var t,n,r,i,o,a,s=0,l=this.length,u="string"==typeof e&&e;if(ot.isFunction(e))return this.each(function(t){ot(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(xt)||[];l>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(An," "):" ")){for(o=0;i=t[o++];)r.indexOf(" "+i+" ")<0&&(r+=i+" ");a=ot.trim(r),n.className!==a&&(n.className=a)}return this},removeClass:function(e){var t,n,r,i,o,a,s=0,l=this.length,u=0===arguments.length||"string"==typeof e&&e;if(ot.isFunction(e))return this.each(function(t){ot(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(xt)||[];l>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(An," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");a=e?ot.trim(r):"",n.className!==a&&(n.className=a)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):this.each(ot.isFunction(e)?function(n){ot(this).toggleClass(e.call(this,n,this.className,t),t)}:function(){if("string"===n)for(var t,r=0,i=ot(this),o=e.match(xt)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else(n===Ct||"boolean"===n)&&(this.className&&ot._data(this,"__className__",this.className),this.className=this.className||e===!1?"":ot._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(An," ").indexOf(t)>=0)return!0;return!1}}),ot.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){ot.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),ot.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var Ln=ot.now(),Hn=/\?/,_n=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;ot.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=ot.trim(t+"");return i&&!ot.trim(i.replace(_n,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():ot.error("Invalid JSON: "+t)},ot.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new DOMParser,n=r.parseFromString(t,"text/xml")):(n=new ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||ot.error("Invalid XML: "+t),n};var $n,qn,Mn=/#.*$/,On=/([?&])_=[^&]*/,Fn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Bn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Pn=/^(?:GET|HEAD)$/,Rn=/^\/\//,Wn=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,zn={},In={},Xn="*/".concat("*");try{qn=location.href}catch(Un){qn=mt.createElement("a"),qn.href="",qn=qn.href}$n=Wn.exec(qn.toLowerCase())||[],ot.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qn,type:"GET",isLocal:Bn.test($n[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Xn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":ot.parseJSON,"text xml":ot.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?W(W(e,ot.ajaxSettings),t):W(ot.ajaxSettings,e)},ajaxPrefilter:P(zn),ajaxTransport:P(In),ajax:function(e,t){function n(e,t,n,r){var i,c,v,y,x,T=t;2!==b&&(b=2,s&&clearTimeout(s),u=void 0,a=r||"",w.readyState=e>0?4:0,i=e>=200&&300>e||304===e,n&&(y=z(d,w,n)),y=I(d,y,w,i),i?(d.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(ot.lastModified[o]=x),x=w.getResponseHeader("etag"),x&&(ot.etag[o]=x)),204===e||"HEAD"===d.type?T="nocontent":304===e?T="notmodified":(T=y.state,c=y.data,v=y.error,i=!v)):(v=T,(e||!T)&&(T="error",0>e&&(e=0))),w.status=e,w.statusText=(t||T)+"",i?h.resolveWith(f,[c,T,w]):h.rejectWith(f,[w,T,v]),w.statusCode(g),g=void 0,l&&p.trigger(i?"ajaxSuccess":"ajaxError",[w,d,i?c:v]),m.fireWith(f,[w,T]),l&&(p.trigger("ajaxComplete",[w,d]),--ot.active||ot.event.trigger("ajaxStop")))}"object"==typeof e&&(t=e,e=void 0),t=t||{};var r,i,o,a,s,l,u,c,d=ot.ajaxSetup({},t),f=d.context||d,p=d.context&&(f.nodeType||f.jquery)?ot(f):ot.event,h=ot.Deferred(),m=ot.Callbacks("once memory"),g=d.statusCode||{},v={},y={},b=0,x="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c)for(c={};t=Fn.exec(a);)c[t[1].toLowerCase()]=t[2];t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=y[n]=y[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)g[t]=[g[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e||x;return u&&u.abort(t),n(0,t),this}};if(h.promise(w).complete=m.add,w.success=w.done,w.error=w.fail,d.url=((e||d.url||qn)+"").replace(Mn,"").replace(Rn,$n[1]+"//"),d.type=t.method||t.type||d.method||d.type,d.dataTypes=ot.trim(d.dataType||"*").toLowerCase().match(xt)||[""],null==d.crossDomain&&(r=Wn.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]===$n[1]&&r[2]===$n[2]&&(r[3]||("http:"===r[1]?"80":"443"))===($n[3]||("http:"===$n[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=ot.param(d.data,d.traditional)),R(zn,d,t,w),2===b)return w;l=d.global,l&&0===ot.active++&&ot.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Pn.test(d.type),o=d.url,d.hasContent||(d.data&&(o=d.url+=(Hn.test(o)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=On.test(o)?o.replace(On,"$1_="+Ln++):o+(Hn.test(o)?"&":"?")+"_="+Ln++)),d.ifModified&&(ot.lastModified[o]&&w.setRequestHeader("If-Modified-Since",ot.lastModified[o]),ot.etag[o]&&w.setRequestHeader("If-None-Match",ot.etag[o])),(d.data&&d.hasContent&&d.contentType!==!1||t.contentType)&&w.setRequestHeader("Content-Type",d.contentType),w.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Xn+"; q=0.01":""):d.accepts["*"]);for(i in d.headers)w.setRequestHeader(i,d.headers[i]);if(d.beforeSend&&(d.beforeSend.call(f,w,d)===!1||2===b))return w.abort();x="abort";for(i in{success:1,error:1,complete:1})w[i](d[i]);if(u=R(In,d,t,w)){w.readyState=1,l&&p.trigger("ajaxSend",[w,d]),d.async&&d.timeout>0&&(s=setTimeout(function(){w.abort("timeout")},d.timeout));try{b=1,u.send(v,n)}catch(T){if(!(2>b))throw T;n(-1,T)}}else n(-1,"No Transport");return w},getJSON:function(e,t,n){return ot.get(e,t,n,"json")},getScript:function(e,t){return ot.get(e,void 0,t,"script")}}),ot.each(["get","post"],function(e,t){ot[t]=function(e,n,r,i){return ot.isFunction(n)&&(i=i||r,r=n,n=void 0),ot.ajax({url:e,type:t,dataType:i,data:n,success:r})}}),ot.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ot.fn[t]=function(e){return this.on(t,e)}}),ot._evalUrl=function(e){return ot.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},ot.fn.extend({wrapAll:function(e){if(ot.isFunction(e))return this.each(function(t){ot(this).wrapAll(e.call(this,t))});if(this[0]){var t=ot(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return this.each(ot.isFunction(e)?function(t){ot(this).wrapInner(e.call(this,t))}:function(){var t=ot(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=ot.isFunction(e);return this.each(function(n){ot(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){ot.nodeName(this,"body")||ot(this).replaceWith(this.childNodes)}).end()}}),ot.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!rt.reliableHiddenOffsets()&&"none"===(e.style&&e.style.display||ot.css(e,"display"))},ot.expr.filters.visible=function(e){return!ot.expr.filters.hidden(e)};var Vn=/%20/g,Jn=/\[\]$/,Yn=/\r?\n/g,Gn=/^(?:submit|button|image|reset|file)$/i,Kn=/^(?:input|select|textarea|keygen)/i;ot.param=function(e,t){var n,r=[],i=function(e,t){t=ot.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=ot.ajaxSettings&&ot.ajaxSettings.traditional),ot.isArray(e)||e.jquery&&!ot.isPlainObject(e))ot.each(e,function(){i(this.name,this.value)});else for(n in e)X(n,e[n],t,i);return r.join("&").replace(Vn,"+")},ot.fn.extend({serialize:function(){return ot.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ot.prop(this,"elements");return e?ot.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ot(this).is(":disabled")&&Kn.test(this.nodeName)&&!Gn.test(e)&&(this.checked||!Lt.test(e))}).map(function(e,t){var n=ot(this).val();return null==n?null:ot.isArray(n)?ot.map(n,function(e){return{name:t.name,value:e.replace(Yn,"\r\n")}}):{name:t.name,value:n.replace(Yn,"\r\n")}}).get()}}),ot.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&U()||V()}:U;var Qn=0,Zn={},er=ot.ajaxSettings.xhr();e.ActiveXObject&&ot(e).on("unload",function(){for(var e in Zn)Zn[e](void 0,!0)}),rt.cors=!!er&&"withCredentials"in er,er=rt.ajax=!!er,er&&ot.ajaxTransport(function(e){if(!e.crossDomain||rt.cors){var t;return{send:function(n,r){var i,o=e.xhr(),a=++Qn;if(o.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(i in e.xhrFields)o[i]=e.xhrFields[i];e.mimeType&&o.overrideMimeType&&o.overrideMimeType(e.mimeType),e.crossDomain||n["X-Requested-With"]||(n["X-Requested-With"]="XMLHttpRequest");for(i in n)void 0!==n[i]&&o.setRequestHeader(i,n[i]+"");o.send(e.hasContent&&e.data||null),t=function(n,i){var s,l,u;if(t&&(i||4===o.readyState))if(delete Zn[a],t=void 0,o.onreadystatechange=ot.noop,i)4!==o.readyState&&o.abort();else{u={},s=o.status,"string"==typeof o.responseText&&(u.text=o.responseText);try{l=o.statusText}catch(c){l=""}s||!e.isLocal||e.crossDomain?1223===s&&(s=204):s=u.text?200:404}u&&r(s,l,u,o.getAllResponseHeaders())},e.async?4===o.readyState?setTimeout(t):o.onreadystatechange=Zn[a]=t:t()},abort:function(){t&&t(void 0,!0)}}}}),ot.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return ot.globalEval(e),e}}}),ot.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),ot.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=mt.head||ot("head")[0]||mt.documentElement;return{send:function(r,i){t=mt.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var tr=[],nr=/(=)\?(?=&|$)|\?\?/;ot.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=tr.pop()||ot.expando+"_"+Ln++;return this[e]=!0,e}}),ot.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(nr.test(t.url)?"url":"string"==typeof t.data&&!(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&nr.test(t.data)&&"data");return s||"jsonp"===t.dataTypes[0]?(i=t.jsonpCallback=ot.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(nr,"$1"+i):t.jsonp!==!1&&(t.url+=(Hn.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||ot.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,tr.push(i)),a&&ot.isFunction(o)&&o(a[0]),a=o=void 0}),"script"):void 0}),ot.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||mt;var r=ft.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=ot.buildFragment([e],t,i),i&&i.length&&ot(i).remove(),ot.merge([],r.childNodes))};var rr=ot.fn.load;ot.fn.load=function(e,t,n){if("string"!=typeof e&&rr)return rr.apply(this,arguments);
+var r,i,o,a=this,s=e.indexOf(" ");return s>=0&&(r=ot.trim(e.slice(s,e.length)),e=e.slice(0,s)),ot.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(o="POST"),a.length>0&&ot.ajax({url:e,type:o,dataType:"html",data:t}).done(function(e){i=arguments,a.html(r?ot("
"+a+"";b=b.firstChild;g&&J(b,g,!0);K({h:d,j:g,c:b,i:1}); +return b.innerHTML},prettyPrint:D.prettyPrint=function(a,d){function g(){for(var b=D.PR_SHOULD_USE_CONTINUATION?c.now()+250:Infinity;i
","
"]},Gt=m(mt),Kt=Gt.appendChild(mt.createElement("div"));Yt.optgroup=Yt.option,Yt.tbody=Yt.tfoot=Yt.colgroup=Yt.caption=Yt.thead,Yt.th=Yt.td,ot.extend({clone:function(e,t,n){var r,i,o,a,s,l=ot.contains(e.ownerDocument,e);if(rt.html5Clone||ot.isXMLDoc(e)||!Ft.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Kt.innerHTML=e.outerHTML,Kt.removeChild(o=Kt.firstChild)),!(rt.noCloneEvent&&rt.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ot.isXMLDoc(e)))for(r=g(o),s=g(e),a=0;null!=(i=s[a]);++a)r[a]&&C(i,r[a]);if(t)if(n)for(s=s||g(e),r=r||g(o),a=0;null!=(i=s[a]);a++)T(i,r[a]);else T(e,o);return r=g(o,"script"),r.length>0&&w(r,!l&&g(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){for(var i,o,a,s,l,u,c,d=e.length,f=m(t),p=[],h=0;d>h;h++)if(o=e[h],o||0===o)if("object"===ot.type(o))ot.merge(p,o.nodeType?[o]:o);else if(zt.test(o)){for(s=s||f.appendChild(t.createElement("div")),l=(Rt.exec(o)||["",""])[1].toLowerCase(),c=Yt[l]||Yt._default,s.innerHTML=c[1]+o.replace(Pt,"<$1>")+c[2],i=c[0];i--;)s=s.lastChild;if(!rt.leadingWhitespace&&Bt.test(o)&&p.push(t.createTextNode(Bt.exec(o)[0])),!rt.tbody)for(o="table"!==l||Wt.test(o)?"| t |
").append(ot.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){a.each(n,i||[e.responseText,t,e])}),this},ot.expr.filters.animated=function(e){return ot.grep(ot.timers,function(t){return e===t.elem}).length};var ir=e.document.documentElement;ot.offset={setOffset:function(e,t,n){var r,i,o,a,s,l,u,c=ot.css(e,"position"),d=ot(e),f={};"static"===c&&(e.style.position="relative"),s=d.offset(),o=ot.css(e,"top"),l=ot.css(e,"left"),u=("absolute"===c||"fixed"===c)&&ot.inArray("auto",[o,l])>-1,u?(r=d.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(l)||0),ot.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):d.css(f)}},ot.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){ot.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;return o?(t=o.documentElement,ot.contains(t,i)?(typeof i.getBoundingClientRect!==Ct&&(r=i.getBoundingClientRect()),n=J(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r):void 0},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===ot.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),ot.nodeName(e[0],"html")||(n=e.offset()),n.top+=ot.css(e[0],"borderTopWidth",!0),n.left+=ot.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-ot.css(r,"marginTop",!0),left:t.left-n.left-ot.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent||ir;e&&!ot.nodeName(e,"html")&&"static"===ot.css(e,"position");)e=e.offsetParent;return e||ir})}}),ot.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);ot.fn[e]=function(r){return At(this,function(e,r,i){var o=J(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?ot(o).scrollLeft():i,n?i:ot(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),ot.each(["top","left"],function(e,t){ot.cssHooks[t]=E(rt.pixelPosition,function(e,n){return n?(n=rn(e,t),tn.test(n)?ot(e).position()[t]+"px":n):void 0})}),ot.each({Height:"height",Width:"width"},function(e,t){ot.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){ot.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return At(this,function(t,n,r){var i;return ot.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?ot.css(t,n,a):ot.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),ot.fn.size=function(){return this.length},ot.fn.andSelf=ot.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return ot});var or=e.jQuery,ar=e.$;return ot.noConflict=function(t){return e.$===ot&&(e.$=ar),t&&e.jQuery===ot&&(e.jQuery=or),ot},typeof t===Ct&&(e.jQuery=e.$=ot),ot}),function($){var ajax=$.ajax;$.extend({ajax:function(url,options){"object"==typeof url&&(options=url,url=void 0),options=options||{},url=options.url;var csrftoken=$("meta[name=_csrf]").attr("content"),headers=options.headers||{},domain=document.domain.replace(/\./gi,"\\.");(!/^(http:|https:).*/.test(url)||eval("/^(http:|https:)\\/\\/(.+\\.)*"+domain+".*/").test(url))&&(headers=$.extend(headers,{"X-Csrf-Token":csrftoken})),options.headers=headers;var callback=options.success;return options.success=function(e){e.once&&$("[name=_once]").val(e.once),callback&&callback.apply(this,arguments)},ajax(url,options)},changeHash:function(e){history.pushState?history.pushState(null,null,e):location.hash=e},deSelect:function(){window.getSelection?window.getSelection().removeAllRanges():document.selection.empty()}})}(jQuery),$(document).ready(function(){Tabs("#dashboard-sidebar-menu"),homepage(),settingsProfile(),settingsSSHKeys(),settingsDelete(),renderMarkdown(),renderCodeView();var e=$("#footer-lang li").length;$("#footer-lang .drop-down").css({top:-31*e+"px",height:31*e-3+"px"})});
\ No newline at end of file
diff --git a/public/ng/less/gogs.less b/public/ng/less/gogs.less
new file mode 100644
index 0000000000..d1b13e1e4c
--- /dev/null
+++ b/public/ng/less/gogs.less
@@ -0,0 +1,7 @@
+@import "gogs/base";
+@import "gogs/markdown";
+@import "gogs/external";
+@import "gogs/dashboard";
+@import "gogs/sign";
+@import "gogs/repository";
+@import "gogs/settings";
\ No newline at end of file
diff --git a/public/ng/less/ui.less b/public/ng/less/ui.less
new file mode 100644
index 0000000000..3db8b12cb6
--- /dev/null
+++ b/public/ng/less/ui.less
@@ -0,0 +1,10 @@
+@import "ui/var";
+@import "ui/reset";
+@import "ui/grid";
+@import "ui/form";
+@import "ui/menu";
+@import "ui/panel";
+@import "ui/label";
+@import "ui/bread";
+@import "ui/alert";
+@import "ui/table";
\ No newline at end of file
diff --git a/public/ng/less/ui/alert.less b/public/ng/less/ui/alert.less
new file mode 100644
index 0000000000..a52bc7f9f2
--- /dev/null
+++ b/public/ng/less/ui/alert.less
@@ -0,0 +1,47 @@
+@import "var";
+
+.alert{
+ padding: .6em 1.5em;
+ margin-bottom: 10px;
+ i{
+ margin-right: 8px;
+ }
+}
+
+.alert-radius{
+ border-radius: .25em;
+}
+
+.alert-red{
+ color: @alertRedColor;
+ border: 1px solid darken(@alertRedColor,10%);
+ background-color: lighten(@alertRedColor,40%);
+}
+
+.alert-blue{
+ color: @alertBlueColor;
+ border: 1px solid darken(@alertBlueColor,10%);
+ background-color: lighten(@alertBlueColor,45%);
+}
+
+.alert-green{
+ color: @alertGreenColor;
+ border: 1px solid darken(@alertGreenColor,10%);
+ background-color: lighten(@alertGreenColor,45%);
+}
+
+.alert-gray{
+ color: @alertGrayColor;
+ border: 1px solid darken(@alertGrayColor,10%);
+ background-color: lighten(@alertGrayColor,35%);
+}
+
+.alert-orange{
+ color: @alertOrangeColor;
+ border: 1px solid darken(@alertOrangeColor,10%);
+ background-color: lighten(@alertOrangeColor,45%);
+}
+
+
+
+
diff --git a/public/ng/less/ui/bread.less b/public/ng/less/ui/bread.less
new file mode 100644
index 0000000000..9e96eb43b9
--- /dev/null
+++ b/public/ng/less/ui/bread.less
@@ -0,0 +1,18 @@
+@import "var";
+
+.breads {
+ .bread {
+ &:after {
+ content: "/";
+ font-weight: bold;
+ margin: 0 4px 0 7px;
+ color:@breadColor;
+ }
+ }
+ .bread:last-child {
+ &:after {
+ content: "";
+ margin: 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/form.less b/public/ng/less/ui/form.less
new file mode 100644
index 0000000000..017432935f
--- /dev/null
+++ b/public/ng/less/ui/form.less
@@ -0,0 +1,192 @@
+@import "var";
+
+// colored buttons
+.btn {
+ &:hover {
+ }
+}
+
+.btn-small {
+ font-size: 0.9*@baseFontSize;
+ padding: .4em .9em;
+}
+
+.btn-large {
+ font-size: 1.2*@baseFontSize;
+}
+
+.btn-green {
+ background-color: @btnGreenColor;
+ border: 1px solid @btnGreenColor;
+ &:hover {
+ background-color: @btnHoverGreenColor;
+ color: #FFF;
+ }
+}
+
+.btn-blue {
+ background-color: @btnBlueColor;
+ border: 1px solid @btnBlueColor;
+ &:hover {
+ background-color: @btnHoverBlueColor;
+ color: #FFF;
+ }
+}
+
+.btn-red {
+ background-color: @btnRedColor;
+ border: 1px solid @btnRedColor;
+ &:hover {
+ background-color: @btnHoverRedColor;
+ color: #FFF;
+ }
+}
+
+.btn-orange {
+ background-color: @btnOrangeColor;
+ border: 1px solid @btnOrangeColor;
+ &:hover {
+ background-color: @btnHoverOrangeColor;
+ color: #FFF;
+ }
+}
+
+.btn-black {
+ background-color: @btnBlackColor;
+ border: 1px solid @btnBlackColor;
+ &:hover {
+ background-color: @btnHoverBlackColor;
+ color: #FFF;
+ }
+}
+
+.btn-gray {
+ background-color: @btnGrayColor;
+ color: @baseFontColor;
+ border: 1px solid @btnGrayBorderColor;
+ &:hover {
+ background-color: @btnGrayHoverColor;
+ color: @baseFontColor;
+ }
+}
+
+// status buttons
+
+.btn-active {
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, .1) inset, 0 0 4px rgba(0, 0, 0, .15) inset
+}
+
+.btn-radius {
+ border-radius: .25em;
+}
+
+.btn-left-radius {
+ border-top-left-radius: .25em;
+ border-bottom-left-radius: .25em;
+}
+
+.btn-right-radius {
+ border-top-right-radius: .25em;
+ border-bottom-right-radius: .25em;
+}
+
+.btn-block {
+ display: block;
+ width: 100%;
+ box-sizing: content-box;
+ text-align: center;
+}
+
+.btn-disabled {
+ opacity: .6;
+ cursor: not-allowed;
+ box-shadow: none;
+ background-image: none !important;
+ border: none;
+ &:hover {
+ background-image: none !important;
+ color: @btnHoverFontColor;
+ }
+}
+
+// input form elements
+
+.ipt {
+ &:focus {
+ border-color: @iptFocusBorderColor;
+ }
+}
+
+.ipt-radius {
+ border-radius: .25em;
+}
+
+.ipt-small {
+ font-size: .8*@baseFontSize;
+}
+
+.ipt-large {
+ font-size: 1.2*@baseFontSize;
+}
+
+.ipt-disabled,
+input[disabled] {
+ background-color: @iptDisabledColor !important;
+ &:focus {
+ background-color: @iptDisabledColor !important;
+ }
+ color: #888;
+ cursor: not-allowed;
+}
+
+.ipt-readonly,
+input[readonly] {
+ &:focus {
+ background-color: @iptDisabledColor !important;
+ }
+}
+
+.ipt-error {
+ border-color: @iptErrorBorderColor !important;
+ background-color: @iptErrorFocusColor !important;
+}
+
+.form {
+ label {
+ margin-right: 1em;
+ }
+ .help {
+ color: @formHelpFontColor;
+ padding-top: .6em;
+ display: inline-block;
+ }
+}
+
+.form-stack {
+ label {
+ display: block;
+ }
+ .field {
+ margin-bottom: 1em;
+ }
+}
+
+.form-align {
+ label,
+ .form-label {
+ display: inline-block;
+ width: 120px;
+ text-align: right;
+ margin-right: 1em;
+ }
+ .field {
+ margin-bottom: 1em;
+ }
+}
+
+label.req {
+ &:after {
+ content: "*";
+ color: @labelRedColor;
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/grid.less b/public/ng/less/ui/grid.less
new file mode 100644
index 0000000000..2b7d004340
--- /dev/null
+++ b/public/ng/less/ui/grid.less
@@ -0,0 +1,99 @@
+@import "var";
+@import "reset";
+
+// float elements
+
+.left {
+ float: left;
+}
+
+.right {
+ float: right;
+}
+
+.clear::after {
+ clear: both;
+ content: " ";
+ width: 0;
+ height: 0;
+ display: block;
+}
+
+.hide {
+ display: none;
+}
+
+// 12 based grids
+
+.grid-1-12 {
+ width: 8.33%;
+}
+
+.grid-2-12,
+.grid-1-6 {
+ width: 16.67%;
+}
+
+.grid-3-12,
+.grid-1-4 {
+ width: 25%;
+}
+
+.grid-4-12,
+.grid-1-3 {
+ width: 33%;
+}
+
+.grid-5-12 {
+ width: 41.67%;
+}
+
+.grid-6-12,
+.grid-1-2 {
+ width: 50%;
+}
+
+.grid-7-12 {
+ width: 58.33%;
+}
+
+.grid-8-12,
+.grid-2-3 {
+ width: 66.67%;
+}
+
+.grid-9-12,
+.grid-3-4 {
+ width: 75%;
+}
+
+.grid-10-12,
+.grid-5-6 {
+ width: 83.33%;
+}
+
+.grid-11-12 {
+ width: 91.67%;
+}
+
+*[class*="grid-"] {
+ box-sizing: content-box;
+}
+
+// 5 based
+
+.grid-1-5 {
+ width: 20%;
+}
+
+.grid-2-5 {
+ width: 40%;
+}
+
+.grid-3-5 {
+ width: 60%;
+}
+
+.grid-4-5 {
+ width: 80%;
+}
diff --git a/public/ng/less/ui/label.less b/public/ng/less/ui/label.less
new file mode 100644
index 0000000000..1cf0a81d85
--- /dev/null
+++ b/public/ng/less/ui/label.less
@@ -0,0 +1,41 @@
+@import "var";
+
+.label {
+ padding: 2px 6px;
+ color: @labelFontColor;
+}
+
+.label-red {
+ background-color: @labelRedColor;
+}
+
+.label-blue {
+ background-color: @labelBlueColor;
+}
+
+.label-gray {
+ background-color: @labelGrayColor;
+}
+
+.label-green {
+ background-color: @labelGreenColor;
+}
+
+.label-orange {
+ background-color: @labelOrangeColor;
+}
+
+.label-black {
+ background-color: @labelBlackColor;
+}
+
+.label-radius{
+ border-radius: .2em;
+}
+
+.label-link{
+ color: @labelFontColor;
+ &:hover{
+ color: @labelFontColor;
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/menu.less b/public/ng/less/ui/menu.less
new file mode 100644
index 0000000000..e36667ce26
--- /dev/null
+++ b/public/ng/less/ui/menu.less
@@ -0,0 +1,158 @@
+@import "var";
+
+// lined menu
+
+ul.menu {
+ > li {
+ list-style: none;
+ > a {
+ padding: .8em 1.2em;
+ &:hover {
+ background-color: @lineMenuHoverBgColor;
+ color: @lineMenuHoverFontColor;
+ }
+ }
+ &.current > a,
+ &.hover > a {
+ color: @lineMenuHoverFontColor;
+ }
+ }
+ > li.head {
+ font-weight: bold;
+ padding: .8em 1.2em;
+ }
+ > li.down:hover {
+ > ul.menu-down {
+ display: block;
+ }
+ }
+ > li.border-bottom {
+ border-bottom: 1px solid @menuBorderColor;
+ height: 0;
+ margin: .5em 0;
+ }
+}
+
+ul.menu-line {
+ > li,
+ > li > a {
+ display: inline-block;
+ }
+ > li.down {
+ position: relative;
+ > a:after {
+ content: "\25BE";
+ margin-left: .4em;
+ }
+ > ul.menu-down {
+ top: 2.1em;
+ width: 150%;
+ }
+ }
+ > li.hover {
+ position: relative;
+ > a:after {
+ position: absolute;
+ content: "\25B4";
+ left: 50%;
+ bottom: -1.1em;
+ margin-left: -4px;
+ }
+ }
+}
+
+ul.menu-vertical,
+ul.menu-down {
+ > li > a,
+ > li.head {
+ display: block;
+ padding: .4em 1.2em;
+ }
+ > li.down {
+ position: relative;
+ > a:after {
+ content: "\25B8";
+ position: absolute;
+ right: .6em;
+ }
+ }
+ > li.hover {
+ position: relative;
+ > a:after {
+ content: "\25B8";
+ position: absolute;
+ left: .5em;
+ }
+ }
+}
+
+ul.menu-border,
+ul.menu-down {
+ border: 1px solid @menuBorderColor;
+ > li.head {
+ border-bottom: 1px solid @menuBorderColor;
+ }
+}
+
+ul.menu-down {
+ position: absolute;
+ display: none;
+ z-index: 99;
+ box-shadow: 0 0 2px @menuShadowColor;
+ background-color: @menuDownBgColor;
+}
+
+ul.menu-radius {
+ border-radius: .3em;
+ > li {
+ &:first-child {
+ border-top-left-radius: .3em;
+ border-top-right-radius: .3em;
+ > a {
+ border-top-left-radius: .2em;
+ border-top-right-radius: .2em;
+ }
+ }
+ &:last-child {
+ border-bottom-left-radius: .3em;
+ border-bottom-right-radius: .3em;
+ > a {
+ border-bottom-left-radius: .2em;
+ border-bottom-right-radius: .2em;
+ }
+ }
+ }
+}
+
+.drop {
+ position: relative;
+ &:hover {
+ > .drop-down {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 200%;
+ display: block;
+ }
+ }
+ > .drop-down {
+ display: none;
+ border: 1px solid @dropBorderColor;
+ box-shadow: 0 0 3px @menuShadowColor;
+ background-color: @dropDownBgColor;
+ }
+}
+
+.drop-bottom {
+ &:after {
+ content: "\25BE";
+ margin-left: .4em;
+ }
+}
+
+.drop-top {
+ &:after {
+ content: "\25B4";
+ margin-left: .4em;
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/panel.less b/public/ng/less/ui/panel.less
new file mode 100644
index 0000000000..52f8dafb00
--- /dev/null
+++ b/public/ng/less/ui/panel.less
@@ -0,0 +1,41 @@
+@import "var";
+.panel {
+ border: 1px solid@panelBorderColor;
+ .panel-header {
+ font-size: 16px;
+ padding: .6em 1.2em;
+ background-color: @panelHeaderBgColor;
+ border-bottom: 1px solid@panelBorderColor;
+ }
+ .panel-body {
+ .panel-desc {
+ margin-bottom: 20px;
+ }
+ }
+ .panel-content {
+ padding: 1em 1.2em;
+ }
+ .panel-footer {
+ padding: .6em 1.2em;
+ background-color: @panelFooterBgColor;
+ border-top: 1px solid@panelBorderColor;
+ }
+ &.panel-radius {
+ border-radius: .3em;
+ .panel-header {
+ border-top-left-radius: .3em;
+ border-top-right-radius: .3em;
+ }
+ .panel-footer {
+ border-bottom-left-radius: .3em;
+ border-bottom-right-radius: .3em;
+ }
+ }
+ &.panel-warning {
+ border-color: #F0C36D;
+ > .panel-header {
+ background-color: #F9EDBE;
+ border-color: #F0C36D;
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less
new file mode 100644
index 0000000000..a1501d6574
--- /dev/null
+++ b/public/ng/less/ui/reset.less
@@ -0,0 +1,376 @@
+@import "var";
+
+* {
+ padding: 0;
+ margin: 0;
+}
+
+html {
+ font-size: @baseFontSize+1;
+ font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+ // make sure min font size
+ -ms-text-size-adjust: 100%;
+ -webkit-text-size-adjust: 100%;
+ line-height: @baseLineHeight;
+
+ color: @baseFontColor;
+ background-color: @baseBgColor;
+
+}
+
+input,
+textarea,
+select,
+option,
+button {
+ font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+}
+
+// html5 block elements
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+main,
+nav,
+section,
+summary,
+.block {
+ display: block;
+}
+
+.inline {
+ display: inline;
+}
+
+.inline-block {
+ display: inline-block;
+}
+
+.dis-table {
+ display: table;
+}
+
+.dis-table-cell {
+ display: table-cell;
+}
+
+.dis-flex {
+ display: flex;
+}
+
+// html5 media elements
+
+audio,
+canvas,
+progress,
+video {
+ display: inline-block;
+ vertical-align: baseline;
+}
+
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+
+// display hidden elements
+
+[hidden],
+template
+.hidden {
+ display: none;
+}
+
+.opacity {
+ opacity: 0;
+}
+
+.opacity-half {
+ opacity: .5;
+}
+
+// links element
+
+a,
+.text-link {
+ color: @linkColor;
+ text-decoration: none;
+ &:hover {
+ color: @linkHoverColor;
+ text-decoration: none;
+ }
+ &:focus {
+ outline: none;
+ }
+}
+
+// stylus elements
+
+b,
+strong,
+.text-bold {
+ font-weight: bold;
+}
+
+dfn,
+.text-italic {
+ font-style: italic;
+}
+
+// headers elements
+
+h1,
+.text-h1 {
+ font-size: 2em;
+ margin-bottom: 0.67em;
+}
+
+h2,
+.text-h2 {
+ font-size: 1.6em;
+ margin-bottom: 0.625em;
+}
+
+h3,
+.text-h3 {
+ font: 1.2em;
+ margin-bottom: 0.5em;
+}
+
+h4,
+h5,
+h6,
+.text-h4,
+.text-h5,
+.text-h6 {
+ font-size: 1em;
+ margin-bottom: .3em;
+}
+
+// text elements
+
+small,
+.text-small {
+ font-size: .8em;
+}
+
+sub,
+sup,
+.text-sup,
+.text-sub {
+ font-size: .7em;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sup,
+.text-sup {
+ top: -0.5em;
+}
+
+sub,
+.text-sub {
+ bottom: -0.25em;
+}
+
+.figure,
+.blockquote {
+ margin: 1em 1.5em;
+}
+
+pre {
+ overflow: auto;
+ margin: 0;
+ padding: .4em 1em;
+}
+
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em;
+}
+
+.text-left {
+ text-align: left;
+}
+
+.text-right {
+ text-align: right;
+}
+
+.text-center {
+ text-align: center;
+}
+
+.list-no-style {
+ list-style: none;
+}
+
+// image elements
+
+img {
+ border: none;
+}
+
+svg:not(:root) {
+ overflow: hidden;
+}
+
+// form elements
+
+label {
+ font-weight: bold;
+}
+
+input,
+.ipt {
+ padding: .6em;
+ line-height: normal;
+ border: 1px solid @iptBorderColor;
+ &:focus {
+ background-color: @iptFocusColor;
+ outline: none;
+ }
+}
+
+button {
+ overflow: visible;
+ padding: .6em 1.2em;
+}
+
+button,
+select {
+ text-transform: none;
+ &:focus {
+ outline: none;
+ }
+}
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button;
+ -moz-appearance: button;
+ cursor: pointer;
+ background-color: @btnBgColor;
+ color: @btnFontColor;
+ border: none;
+ &:hover {
+ background-color: @btnHoverBgColor;
+ color: @btnHoverFontColor;
+ }
+}
+
+button[disabled],
+html input[disabled] {
+ cursor: default;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box;
+ padding: 0;
+}
+
+input[type="search"] {
+ -webkit-appearance: textfield;
+ -moz-appearance: textfield;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+}
+
+fieldset {
+ border: 1px solid @iptBorderColor;
+ margin: 0 2px;
+ padding: 0.4em 0.8em 0.8em;
+}
+
+legend {
+ border: 0;
+ padding: 0;
+}
+
+textarea {
+ overflow: auto;
+ border: 1px solid @iptBorderColor;
+ padding: .6em;
+ &:focus {
+ background-color: @iptFocusColor;
+ outline: none;
+ }
+}
+
+optgroup {
+ font-weight: bold;
+}
+
+// table elements
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+td,
+th {
+ padding: 0;
+}
+
+// hr element
+
+hr {
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ height: 0;
+ border: none;
+ border-bottom: 1px solid @hrColor;
+ margin-bottom: .75em;
+}
+
+// code element
+
+p {
+ code {
+ color: @inlineCodeColor;
+ }
+}
+
+// radius element
+
+.radius {
+ border-radius: .25em;
+}
+
+// truncate element
+
+.text-truncate {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: inline-block;
+ vertical-align: top;
+}
+
+// code elements
+
+pre {
+ line-height: 1.6;
+ overflow: auto;
+ padding: 0;
+}
diff --git a/public/ng/less/ui/table.less b/public/ng/less/ui/table.less
new file mode 100644
index 0000000000..0ceb5e8c95
--- /dev/null
+++ b/public/ng/less/ui/table.less
@@ -0,0 +1,63 @@
+@import "var";
+
+table {
+ th,
+ td {
+ padding: .3em .6em;
+ line-height: 30px;
+ }
+}
+
+.table-border {
+ border: 1px solid @tableBorderColor;
+ tr {
+ border-top: 1px solid @tableCellBorderColor;
+ th,
+ td, {
+ border-top: 1px solid @tableCellBorderColor;
+ }
+ &:first-child {
+ border-top: none;
+ }
+ }
+ thead {
+ border-bottom: 1px solid @tableBorderColor;
+ }
+}
+
+.table-block {
+ width: 100%;
+ box-sizing: border-box;
+}
+
+.table-radius {
+ border-collapse: separate !important;
+ border-radius: .3em;
+ thead:first-child {
+ border-top-left-radius: .3em;
+ border-top-right-radius: .3em;
+ tr:first-child {
+ border-top-left-radius: .3em;
+ > th:first-child {
+ border-top-left-radius: .3em;
+ }
+ > th:last-child {
+ border-top-right-radius: .3em;
+ }
+ }
+ }
+ tbody {
+ border-bottom-left-radius: .3em;
+ border-bottom-right-radius: .3em;
+ tr:last-child {
+ border-bottom-left-radius: .3em;
+ border-bottom-right-radius: .3em;
+ > td:first-child {
+ border-bottom-left-radius: .3em;
+ }
+ > td:last-child {
+ border-bottom-right-radius: .3em;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/ng/less/ui/var.less b/public/ng/less/ui/var.less
new file mode 100644
index 0000000000..e3c5ada633
--- /dev/null
+++ b/public/ng/less/ui/var.less
@@ -0,0 +1,83 @@
+@baseFontSize: 12px;
+
+@baseLineHeight: 24px;
+
+@baseBgColor: #FAFAFA;
+@baseFontColor: #444;
+
+@linkColor: #428BCA;
+@linkHoverColor: #399ADE;
+@linkVisitedColor: #0c172f;
+
+@iptBorderColor: #BBB;
+@iptFocusColor: #f2fffc;
+@iptFocusBorderColor: #428BCA;
+@iptDisabledColor: #F2F2F2;
+@iptErrorBorderColor: #b63b2c;
+@iptErrorFocusColor: #ffF0F0;
+@formHelpFontColor:#999;
+
+@hrColor: #DDD;
+
+@inlineCodeColor: #b63b2c;
+
+@btnBgColor: #888;
+@btnFontColor: #FAFAFA;
+@btnHoverBgColor: #444;
+@btnHoverFontColor: #FFF;
+
+@btnGreenColor: #65AD4E;
+@btnHoverGreenColor: #71BF57;
+
+@btnBlueColor: #428BCA;
+@btnHoverBlueColor: #539CDB;
+
+@btnRedColor: #D9453D;
+@btnHoverRedColor: #FF635A;
+
+@btnBlackColor: #444;
+@btnHoverBlackColor: #383838;
+
+@btnOrangeColor: #DF7514;
+@btnHoverOrangeColor: #df8229;
+
+@btnGrayColor: #F0F0F0;
+@btnGrayHoverColor: #FAFAFA;
+@btnGrayBorderColor: #D0D0D0;
+
+@lineMenuHoverBgColor: #EAEAEA;
+@lineMenuHoverFontColor: #444;
+
+@menuBorderColor: #BBB;
+@dropBorderColor: #BBB;
+@menuShadowColor: #666;
+@dropShadowColor: #666;
+@menuDownBgColor: #FFF;
+@dropDownBgColor: #FFF;
+
+@panelBorderColor: #CCC;
+@panelHeaderBgColor: #EEE;
+@panelFooterBgColor: #EEE;
+
+@labelRedColor: #D9453D;
+@labelBlueColor: #428BCA;
+@labelGreenColor: #65AD4E;
+@labelOrangeColor: #DF7514;
+@labelBlackColor: #444;
+@labelFontColor: #FFF;
+@labelGrayColor: #999;
+
+@breadColor: #444;
+
+@alertRedColor: #D9453D;
+@alertBlueColor: #428BCA;
+@alertGreenColor: #65AD4E;
+@alertOrangeColor: #DF7514;
+@alertBlackColor: #444;
+@alertGrayColor: #999;
+
+@tableBorderColor:#D6D6D6;
+@tableCellBorderColor:#EAEAEA;
+
+@preBgColor:#444;
+@preFontColor:#FFF;
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index eb4123435a..efdc803b95 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -10,7 +10,8 @@ import (
"strings"
"time"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/com"
+ "github.com/Unknwon/macaron"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
@@ -126,7 +127,7 @@ func Dashboard(ctx *middleware.Context) {
ctx.Data["PageIsDashboard"] = true
// Run operation.
- op, _ := base.StrTo(ctx.Query("op")).Int()
+ op, _ := com.StrTo(ctx.Query("op")).Int()
if op > 0 {
var err error
var success string
@@ -159,7 +160,7 @@ func Users(ctx *middleware.Context) {
ctx.Data["Title"] = "User Management"
ctx.Data["PageIsUsers"] = true
- p := base.StrTo(ctx.Query("p")).MustInt()
+ p := com.StrTo(ctx.Query("p")).MustInt()
if p < 1 {
p = 1
}
@@ -188,7 +189,7 @@ func Repositories(ctx *middleware.Context) {
ctx.Data["Title"] = "Repository Management"
ctx.Data["PageIsRepos"] = true
- p := base.StrTo(ctx.Query("p")).MustInt()
+ p := com.StrTo(ctx.Query("p")).MustInt()
if p < 1 {
p = 1
}
@@ -235,7 +236,7 @@ func Config(ctx *middleware.Context) {
ctx.Data["OfflineMode"] = setting.OfflineMode
ctx.Data["DisableRouterLog"] = setting.DisableRouterLog
ctx.Data["RunUser"] = setting.RunUser
- ctx.Data["RunMode"] = strings.Title(martini.Env)
+ ctx.Data["RunMode"] = strings.Title(macaron.Env)
ctx.Data["RepoRootPath"] = setting.RepoRootPath
ctx.Data["StaticRootPath"] = setting.StaticRootPath
ctx.Data["LogRootPath"] = setting.LogRootPath
diff --git a/routers/admin/auth.go b/routers/admin/auth.go
index ff6c0325b6..44af962751 100644
--- a/routers/admin/auth.go
+++ b/routers/admin/auth.go
@@ -7,7 +7,7 @@ package admin
import (
"strings"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/com"
"github.com/go-xorm/core"
"github.com/gogits/gogs/models"
@@ -89,13 +89,13 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
ctx.Redirect("/admin/auths")
}
-func EditAuthSource(ctx *middleware.Context, params martini.Params) {
+func EditAuthSource(ctx *middleware.Context) {
ctx.Data["Title"] = "Edit Authentication"
ctx.Data["PageIsAuths"] = true
ctx.Data["LoginTypes"] = models.LoginTypes
ctx.Data["SMTPAuths"] = models.SMTPAuths
- id, err := base.StrTo(params["authid"]).Int64()
+ id, err := com.StrTo(ctx.Params(":authid")).Int64()
if err != nil {
ctx.Handle(404, "admin.auths.EditAuthSource", err)
return
@@ -168,11 +168,11 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
ctx.Redirect("/admin/auths")
}
-func DeleteAuthSource(ctx *middleware.Context, params martini.Params) {
+func DeleteAuthSource(ctx *middleware.Context) {
ctx.Data["Title"] = "Delete Authentication"
ctx.Data["PageIsAuths"] = true
- id, err := base.StrTo(params["authid"]).Int64()
+ id, err := com.StrTo(ctx.Params(":authid")).Int64()
if err != nil {
ctx.Handle(404, "admin.auths.DeleteAuth", err)
return
@@ -188,7 +188,7 @@ func DeleteAuthSource(ctx *middleware.Context, params martini.Params) {
switch err {
case models.ErrAuthenticationUserUsed:
ctx.Flash.Error("This authentication still has used by some users, you should move them and then delete again.")
- ctx.Redirect("/admin/auths/" + params["authid"])
+ ctx.Redirect("/admin/auths/" + ctx.Params(":authid"))
default:
ctx.Handle(500, "admin.auths.DeleteAuth(DelLoginSource)", err)
}
diff --git a/routers/admin/user.go b/routers/admin/user.go
index 2d22cfdd89..0355632b53 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -7,7 +7,7 @@ package admin
import (
"strings"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/com"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
@@ -42,7 +42,7 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
return
}
- if form.Password != form.RetypePasswd {
+ if form.Password != form.Retype {
ctx.Data["Err_Password"] = true
ctx.Data["Err_RetypePasswd"] = true
ctx.RenderWithErr("Password and re-type password are not same.", "admin/users/new", &form)
@@ -60,14 +60,13 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
if len(form.LoginType) > 0 {
// NOTE: need rewrite.
fields := strings.Split(form.LoginType, "-")
- tp, _ := base.StrTo(fields[0]).Int()
+ tp, _ := com.StrTo(fields[0]).Int()
u.LoginType = models.LoginType(tp)
- u.LoginSource, _ = base.StrTo(fields[1]).Int64()
+ u.LoginSource, _ = com.StrTo(fields[1]).Int64()
u.LoginName = form.LoginName
}
- var err error
- if u, err = models.CreateUser(u); err != nil {
+ if err := models.CreateUser(u); err != nil {
switch err {
case models.ErrUserAlreadyExist:
ctx.RenderWithErr("Username has been already taken", USER_NEW, &form)
@@ -87,11 +86,11 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
ctx.Redirect("/admin/users")
}
-func EditUser(ctx *middleware.Context, params martini.Params) {
+func EditUser(ctx *middleware.Context) {
ctx.Data["Title"] = "Edit Account"
ctx.Data["PageIsUsers"] = true
- uid, err := base.StrTo(params["userid"]).Int()
+ uid, err := com.StrTo(ctx.Params(":userid")).Int()
if err != nil {
ctx.Handle(404, "admin.user.EditUser", err)
return
@@ -113,11 +112,11 @@ func EditUser(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, USER_EDIT)
}
-func EditUserPost(ctx *middleware.Context, params martini.Params, form auth.AdminEditUserForm) {
+func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) {
ctx.Data["Title"] = "Edit Account"
ctx.Data["PageIsUsers"] = true
- uid, err := base.StrTo(params["userid"]).Int()
+ uid, err := com.StrTo(ctx.Params(":userid")).Int()
if err != nil {
ctx.Handle(404, "admin.user.EditUserPost", err)
return
@@ -134,7 +133,7 @@ func EditUserPost(ctx *middleware.Context, params martini.Params, form auth.Admi
return
}
- if (form.Passwd != "") {
+ if form.Passwd != "" {
u.Passwd = form.Passwd
u.Rands = models.GetUserSalt()
u.Salt = models.GetUserSalt()
@@ -157,15 +156,15 @@ func EditUserPost(ctx *middleware.Context, params martini.Params, form auth.Admi
ctx.Data["User"] = u
ctx.Flash.Success("Account profile has been successfully updated.")
- ctx.Redirect("/admin/users/" + params["userid"])
+ ctx.Redirect("/admin/users/" + ctx.Params(":userid"))
}
-func DeleteUser(ctx *middleware.Context, params martini.Params) {
+func DeleteUser(ctx *middleware.Context) {
ctx.Data["Title"] = "Delete Account"
ctx.Data["PageIsUsers"] = true
//log.Info("delete")
- uid, err := base.StrTo(params["userid"]).Int()
+ uid, err := com.StrTo(ctx.Params(":userid")).Int()
if err != nil {
ctx.Handle(404, "admin.user.DeleteUser", err)
return
@@ -181,7 +180,7 @@ func DeleteUser(ctx *middleware.Context, params martini.Params) {
switch err {
case models.ErrUserOwnRepos:
ctx.Flash.Error("This account still has ownership of repository, owner has to delete or transfer them first.")
- ctx.Redirect("/admin/users/" + params["userid"])
+ ctx.Redirect("/admin/users/" + ctx.Params(":userid"))
default:
ctx.Handle(500, "admin.user.DeleteUser", err)
}
diff --git a/routers/api/v1/users.go b/routers/api/v1/users.go
index e4da60aa7b..fe67033748 100644
--- a/routers/api/v1/users.go
+++ b/routers/api/v1/users.go
@@ -5,8 +5,9 @@
package v1
import (
+ "github.com/Unknwon/com"
+
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
@@ -17,7 +18,7 @@ type user struct {
func SearchUsers(ctx *middleware.Context) {
q := ctx.Query("q")
- limit, err := base.StrTo(ctx.Query("limit")).Int()
+ limit, err := com.StrTo(ctx.Query("limit")).Int()
if err != nil {
limit = 10
}
diff --git a/routers/dev/debug.go b/routers/dev/debug.go
index 62022146ad..6ef40a6226 100644
--- a/routers/dev/debug.go
+++ b/routers/dev/debug.go
@@ -7,10 +7,10 @@ package dev
import (
"net/http/pprof"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/macaron"
)
-func RegisterDebugRoutes(r martini.Router) {
+func RegisterDebugRoutes(r *macaron.Macaron) {
r.Any("/debug/pprof/cmdline", pprof.Cmdline)
r.Any("/debug/pprof/profile", pprof.Profile)
r.Any("/debug/pprof/symbol", pprof.Symbol)
diff --git a/routers/dev/template.go b/routers/dev/template.go
index da477c94c0..e4f2429ae9 100644
--- a/routers/dev/template.go
+++ b/routers/dev/template.go
@@ -5,15 +5,13 @@
package dev
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
)
-func TemplatePreview(ctx *middleware.Context, params martini.Params) {
+func TemplatePreview(ctx *middleware.Context) {
ctx.Data["User"] = models.User{Name: "Unknown"}
ctx.Data["AppName"] = setting.AppName
ctx.Data["AppVer"] = setting.AppVer
@@ -23,5 +21,5 @@ func TemplatePreview(ctx *middleware.Context, params martini.Params) {
ctx.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60
ctx.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60
ctx.Data["CurDbValue"] = ""
- ctx.HTML(200, base.TplName(params["_1"]))
+ ctx.HTML(200, base.TplName(ctx.Params("*")))
}
diff --git a/routers/dashboard.go b/routers/home.go
similarity index 58%
rename from routers/dashboard.go
rename to routers/home.go
index 4ef4e54f49..770aca034b 100644
--- a/routers/dashboard.go
+++ b/routers/home.go
@@ -5,7 +5,6 @@
package routers
import (
- "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
@@ -23,33 +22,17 @@ func Home(ctx *middleware.Context) {
}
// Check auto-login.
- userName := ctx.GetCookie(setting.CookieUserName)
- if len(userName) != 0 {
+ uname := ctx.GetCookie(setting.CookieUserName)
+ if len(uname) != 0 {
ctx.Redirect("/user/login")
return
}
ctx.Data["PageIsHome"] = true
-
- // Show recent updated repositories for new visitors.
- repos, err := models.GetRecentUpdatedRepositories()
- if err != nil {
- ctx.Handle(500, "dashboard.Home(GetRecentUpdatedRepositories)", err)
- return
- }
-
- for _, repo := range repos {
- if err = repo.GetOwner(); err != nil {
- ctx.Handle(500, "dashboard.Home(GetOwner)", err)
- return
- }
- }
- ctx.Data["Repos"] = repos
ctx.HTML(200, HOME)
}
func NotFound(ctx *middleware.Context) {
ctx.Data["Title"] = "Page Not Found"
- ctx.Data["PageIsNotFound"] = true
ctx.Handle(404, "home.NotFound", nil)
}
diff --git a/routers/install.go b/routers/install.go
index bb3c16eae4..516d11e4aa 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -11,8 +11,9 @@ import (
"path"
"strings"
+ "github.com/Unknwon/com"
"github.com/Unknwon/goconfig"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/macaron"
"github.com/go-xorm/xorm"
"github.com/gogits/gogs/models"
@@ -33,12 +34,12 @@ const (
func checkRunMode() {
switch setting.Cfg.MustValue("", "RUN_MODE") {
case "prod":
- martini.Env = martini.Prod
+ macaron.Env = macaron.PROD
setting.ProdMode = true
case "test":
- martini.Env = martini.Test
+ macaron.Env = macaron.TEST
}
- log.Info("Run Mode: %s", strings.Title(martini.Env))
+ log.Info("Run Mode: %s", strings.Title(macaron.Env))
}
func NewServices() {
@@ -59,7 +60,7 @@ func GlobalInit() {
if setting.InstallLock {
if err := models.NewEngine(); err != nil {
- log.Fatal("Fail to initialize ORM engine: %v", err)
+ log.Fatal(4, "Fail to initialize ORM engine: %v", err)
}
models.HasEngine = true
@@ -210,8 +211,8 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
setting.Cfg.SetValue("mailer", "USER", form.SmtpEmail)
setting.Cfg.SetValue("mailer", "PASSWD", form.SmtpPasswd)
- setting.Cfg.SetValue("service", "REGISTER_EMAIL_CONFIRM", base.ToStr(form.RegisterConfirm == "on"))
- setting.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", base.ToStr(form.MailNotify == "on"))
+ setting.Cfg.SetValue("service", "REGISTER_EMAIL_CONFIRM", com.ToStr(form.RegisterConfirm == "on"))
+ setting.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", com.ToStr(form.MailNotify == "on"))
}
setting.Cfg.SetValue("", "RUN_MODE", "prod")
@@ -227,7 +228,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
GlobalInit()
// Create admin account.
- if _, err := models.CreateUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd,
+ if err := models.CreateUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd,
IsAdmin: true, IsActive: true}); err != nil {
if err != models.ErrUserAlreadyExist {
setting.InstallLock = false
diff --git a/routers/org/members.go b/routers/org/members.go
index c6f49b14bd..ac278d4e6d 100644
--- a/routers/org/members.go
+++ b/routers/org/members.go
@@ -5,12 +5,10 @@
package org
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/modules/middleware"
)
-func Members(ctx *middleware.Context, params martini.Params) {
- ctx.Data["Title"] = "Organization " + params["org"] + " Members"
+func Members(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Organization " + ctx.Params(":org") + " Members"
ctx.HTML(200, "org/members")
}
diff --git a/routers/org/org.go b/routers/org/org.go
index 337fe89eb7..74527d6008 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -5,8 +5,6 @@
package org
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
@@ -21,10 +19,10 @@ const (
SETTINGS base.TplName = "org/settings"
)
-func Home(ctx *middleware.Context, params martini.Params) {
- ctx.Data["Title"] = "Organization " + params["org"]
+func Home(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Organization " + ctx.Params(":org")
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.Home(GetUserByName)", err)
@@ -99,12 +97,12 @@ func NewPost(ctx *middleware.Context, form auth.CreateOrgForm) {
ctx.Redirect("/org/" + form.OrgName + "/dashboard")
}
-func Dashboard(ctx *middleware.Context, params martini.Params) {
+func Dashboard(ctx *middleware.Context) {
ctx.Data["Title"] = "Dashboard"
ctx.Data["PageIsUserDashboard"] = true
ctx.Data["PageIsOrgDashboard"] = true
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.Dashboard(GetUserByName)", err)
@@ -137,10 +135,10 @@ func Dashboard(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, user.DASHBOARD)
}
-func Settings(ctx *middleware.Context, params martini.Params) {
+func Settings(ctx *middleware.Context) {
ctx.Data["Title"] = "Settings"
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.Settings(GetUserByName)", err)
@@ -154,10 +152,10 @@ func Settings(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, SETTINGS)
}
-func SettingsPost(ctx *middleware.Context, params martini.Params, form auth.OrgSettingForm) {
+func SettingsPost(ctx *middleware.Context, form auth.OrgSettingForm) {
ctx.Data["Title"] = "Settings"
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.SettingsPost(GetUserByName)", err)
@@ -187,10 +185,10 @@ func SettingsPost(ctx *middleware.Context, params martini.Params, form auth.OrgS
ctx.Redirect("/org/" + org.Name + "/settings")
}
-func DeletePost(ctx *middleware.Context, params martini.Params) {
+func DeletePost(ctx *middleware.Context) {
ctx.Data["Title"] = "Settings"
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.DeletePost(GetUserByName)", err)
diff --git a/routers/org/teams.go b/routers/org/teams.go
index 0b17f46368..d494ddc04d 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -5,8 +5,6 @@
package org
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
@@ -19,10 +17,10 @@ const (
TEAM_NEW base.TplName = "org/team_new"
)
-func Teams(ctx *middleware.Context, params martini.Params) {
- ctx.Data["Title"] = "Organization " + params["org"] + " Teams"
+func Teams(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Organization " + ctx.Params(":org") + " Teams"
- org, err := models.GetUserByName(params["org"])
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.Teams(GetUserByName)", err)
@@ -48,8 +46,8 @@ func Teams(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, TEAMS)
}
-func NewTeam(ctx *middleware.Context, params martini.Params) {
- org, err := models.GetUserByName(params["org"])
+func NewTeam(ctx *middleware.Context) {
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.NewTeam(GetUserByName)", err)
@@ -69,8 +67,8 @@ func NewTeam(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, TEAM_NEW)
}
-func NewTeamPost(ctx *middleware.Context, params martini.Params, form auth.CreateTeamForm) {
- org, err := models.GetUserByName(params["org"])
+func NewTeamPost(ctx *middleware.Context, form auth.CreateTeamForm) {
+ org, err := models.GetUserByName(ctx.Params(":org"))
if err != nil {
if err == models.ErrUserNotExist {
ctx.Handle(404, "org.NewTeamPost(GetUserByName)", err)
@@ -125,12 +123,12 @@ func NewTeamPost(ctx *middleware.Context, params martini.Params, form auth.Creat
ctx.Redirect("/org/" + org.LowerName + "/teams/" + t.LowerName)
}
-func EditTeam(ctx *middleware.Context, params martini.Params) {
- ctx.Data["Title"] = "Organization " + params["org"] + " Edit Team"
+func EditTeam(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Organization " + ctx.Params(":org") + " Edit Team"
ctx.HTML(200, "org/edit_team")
}
-func SingleTeam(ctx *middleware.Context,params martini.Params){
- ctx.Data["Title"] = "single-team"+params["org"]
- ctx.HTML(200,"org/team")
+func SingleTeam(ctx *middleware.Context) {
+ ctx.Data["Title"] = "single-team" + ctx.Params(":org")
+ ctx.HTML(200, "org/team")
}
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 9bad7289b9..c340b2bf6b 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -5,8 +5,6 @@
package repo
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
@@ -15,7 +13,7 @@ const (
BRANCH base.TplName = "repo/branch"
)
-func Branches(ctx *middleware.Context, params martini.Params) {
+func Branches(ctx *middleware.Context) {
ctx.Data["Title"] = "Branches"
ctx.Data["IsRepoToolbarBranches"] = true
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index aa5c22e417..6320123b40 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -7,7 +7,7 @@ package repo
import (
"path"
- "github.com/go-martini/martini"
+ "github.com/Unknwon/com"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
@@ -19,7 +19,7 @@ const (
DIFF base.TplName = "repo/diff"
)
-func Commits(ctx *middleware.Context, params martini.Params) {
+func Commits(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarCommits"] = true
userName := ctx.Repo.Owner.Name
@@ -27,21 +27,21 @@ func Commits(ctx *middleware.Context, params martini.Params) {
brs, err := ctx.Repo.GitRepo.GetBranches()
if err != nil {
- ctx.Handle(500, "repo.Commits(GetBranches)", err)
+ ctx.Handle(500, "GetBranches", err)
return
} else if len(brs) == 0 {
- ctx.Handle(404, "repo.Commits(GetBranches)", nil)
+ ctx.Handle(404, "GetBranches", nil)
return
}
commitsCount, err := ctx.Repo.Commit.CommitsCount()
if err != nil {
- ctx.Handle(500, "repo.Commits(GetCommitsCount)", err)
+ ctx.Handle(500, "GetCommitsCount", err)
return
}
// Calculate and validate page number.
- page, _ := base.StrTo(ctx.Query("p")).Int()
+ page, _ := com.StrTo(ctx.Query("p")).Int()
if page < 1 {
page = 1
}
@@ -57,7 +57,7 @@ func Commits(ctx *middleware.Context, params martini.Params) {
// Both `git log branchName` and `git log commitId` work.
ctx.Data["Commits"], err = ctx.Repo.Commit.CommitsByRange(page)
if err != nil {
- ctx.Handle(500, "repo.Commits(CommitsByRange)", err)
+ ctx.Handle(500, "CommitsByRange", err)
return
}
@@ -69,7 +69,7 @@ func Commits(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, COMMITS)
}
-func SearchCommits(ctx *middleware.Context, params martini.Params) {
+func SearchCommits(ctx *middleware.Context) {
ctx.Data["IsSearchPage"] = true
ctx.Data["IsRepoToolbarCommits"] = true
@@ -79,15 +79,15 @@ func SearchCommits(ctx *middleware.Context, params martini.Params) {
return
}
- userName := params["username"]
- repoName := params["reponame"]
+ userName := ctx.Params(":username")
+ repoName := ctx.Params(":reponame")
brs, err := ctx.Repo.GitRepo.GetBranches()
if err != nil {
- ctx.Handle(500, "repo.SearchCommits(GetBranches)", err)
+ ctx.Handle(500, "GetBranches", err)
return
} else if len(brs) == 0 {
- ctx.Handle(404, "repo.SearchCommits(GetBranches)", nil)
+ ctx.Handle(404, "GetBranches", nil)
return
}
@@ -105,7 +105,7 @@ func SearchCommits(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, COMMITS)
}
-func Diff(ctx *middleware.Context, params martini.Params) {
+func Diff(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarCommits"] = true
userName := ctx.Repo.Owner.Name
@@ -116,7 +116,7 @@ func Diff(ctx *middleware.Context, params martini.Params) {
diff, err := models.GetDiff(models.RepoPath(userName, repoName), commitId)
if err != nil {
- ctx.Handle(404, "repo.Diff(GetDiff)", err)
+ ctx.Handle(404, "GetDiff", err)
return
}
@@ -135,7 +135,6 @@ func Diff(ctx *middleware.Context, params martini.Params) {
if n > 0 {
buf = buf[:n]
}
- dataRc.Close()
_, isImage := base.IsImageFile(buf)
return isImage
}
@@ -163,25 +162,25 @@ func Diff(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, DIFF)
}
-func FileHistory(ctx *middleware.Context, params martini.Params) {
+func FileHistory(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarCommits"] = true
- fileName := params["_1"]
+ fileName := ctx.Params("*")
if len(fileName) == 0 {
- Commits(ctx, params)
+ Commits(ctx)
return
}
userName := ctx.Repo.Owner.Name
repoName := ctx.Repo.Repository.Name
- branchName := params["branchname"]
+ branchName := ctx.Params(":branchname")
brs, err := ctx.Repo.GitRepo.GetBranches()
if err != nil {
- ctx.Handle(500, "repo.FileHistory", err)
+ ctx.Handle(500, "GetBranches", err)
return
} else if len(brs) == 0 {
- ctx.Handle(404, "repo.FileHistory", nil)
+ ctx.Handle(404, "GetBranches", nil)
return
}
@@ -195,7 +194,7 @@ func FileHistory(ctx *middleware.Context, params martini.Params) {
}
// Calculate and validate page number.
- page, _ := base.StrTo(ctx.Query("p")).Int()
+ page := com.StrTo(ctx.Query("p")).MustInt()
if page < 1 {
page = 1
}
diff --git a/routers/repo/download.go b/routers/repo/download.go
index 7e20b0e095..abb9b06292 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -6,24 +6,18 @@ package repo
import (
"io"
- "os"
- "path/filepath"
-
- "github.com/Unknwon/com"
- "github.com/go-martini/martini"
-
- "github.com/gogits/git"
+ "path"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
-func SingleDownload(ctx *middleware.Context, params martini.Params) {
- treename := params["_1"]
+func SingleDownload(ctx *middleware.Context) {
+ treename := ctx.Params("*")
blob, err := ctx.Repo.Commit.GetBlobByPath(treename)
if err != nil {
- ctx.Handle(500, "repo.SingleDownload(GetBlobByPath)", err)
+ ctx.Handle(500, "GetBlobByPath", err)
return
}
@@ -39,67 +33,13 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) {
buf = buf[:n]
}
- defer func() {
- dataRc.Close()
- }()
-
contentType, isTextFile := base.IsTextFile(buf)
_, isImageFile := base.IsImageFile(buf)
- ctx.Res.Header().Set("Content-Type", contentType)
+ ctx.Resp.Header().Set("Content-Type", contentType)
if !isTextFile && !isImageFile {
- ctx.Res.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(treename))
- ctx.Res.Header().Set("Content-Transfer-Encoding", "binary")
+ ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(treename))
+ ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
}
- ctx.Res.Write(buf)
- io.Copy(ctx.Res, dataRc)
-}
-
-func ZipDownload(ctx *middleware.Context, params martini.Params) {
- commitId := ctx.Repo.CommitId
- archivesPath := filepath.Join(ctx.Repo.GitRepo.Path, "archives/zip")
- if !com.IsDir(archivesPath) {
- if err := os.MkdirAll(archivesPath, 0755); err != nil {
- ctx.Handle(500, "ZipDownload -> os.Mkdir(archivesPath)", err)
- return
- }
- }
-
- archivePath := filepath.Join(archivesPath, commitId+".zip")
-
- if com.IsFile(archivePath) {
- ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".zip")
- return
- }
-
- if err := ctx.Repo.Commit.CreateArchive(archivePath, git.AT_ZIP); err != nil {
- ctx.Handle(500, "ZipDownload -> CreateArchive "+archivePath, err)
- return
- }
-
- ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".zip")
-}
-
-func TarGzDownload(ctx *middleware.Context, params martini.Params) {
- commitId := ctx.Repo.CommitId
- archivesPath := filepath.Join(ctx.Repo.GitRepo.Path, "archives/targz")
- if !com.IsDir(archivesPath) {
- if err := os.MkdirAll(archivesPath, 0755); err != nil {
- ctx.Handle(500, "TarGzDownload -> os.Mkdir(archivesPath)", err)
- return
- }
- }
-
- archivePath := filepath.Join(archivesPath, commitId+".tar.gz")
-
- if com.IsFile(archivePath) {
- ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".tar.gz")
- return
- }
-
- if err := ctx.Repo.Commit.CreateArchive(archivePath, git.AT_TARGZ); err != nil {
- ctx.Handle(500, "TarGzDownload -> CreateArchive "+archivePath, err)
- return
- }
-
- ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".tar.gz")
+ ctx.Resp.Write(buf)
+ io.Copy(ctx.Resp, dataRc)
}
diff --git a/routers/repo/http.go b/routers/repo/http.go
index d22c0f8781..4ffe5ec345 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -6,6 +6,8 @@ package repo
import (
"bytes"
+ "encoding/base64"
+ "errors"
"fmt"
"io"
"io/ioutil"
@@ -19,16 +21,43 @@ import (
"strings"
"time"
- "github.com/go-martini/martini"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
)
-func Http(ctx *middleware.Context, params martini.Params) {
- username := params["username"]
- reponame := params["reponame"]
+func basicEncode(username, password string) string {
+ auth := username + ":" + password
+ return base64.StdEncoding.EncodeToString([]byte(auth))
+}
+
+func basicDecode(encoded string) (user string, name string, err error) {
+ var s []byte
+ s, err = base64.StdEncoding.DecodeString(encoded)
+ if err != nil {
+ return user, name, err
+ }
+
+ a := strings.Split(string(s), ":")
+ if len(a) == 2 {
+ user, name = a[0], a[1]
+ } else {
+ err = errors.New("decode failed")
+ }
+ return user, name, err
+}
+
+func authRequired(ctx *middleware.Context) {
+ ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=\".\"")
+ ctx.Data["ErrorMsg"] = "no basic auth and digit auth"
+ ctx.HTML(401, base.TplName("status/401"))
+}
+
+func Http(ctx *middleware.Context) {
+ username := ctx.Params(":username")
+ reponame := ctx.Params(":reponame")
if strings.HasSuffix(reponame, ".git") {
reponame = reponame[:len(reponame)-4]
}
@@ -50,7 +79,7 @@ func Http(ctx *middleware.Context, params martini.Params) {
if err == models.ErrUserNotExist {
ctx.Handle(404, "repo.Http(GetUserByName)", nil)
} else {
- ctx.Handle(500, "repo.Http(GetUserByName)", nil)
+ ctx.Handle(500, "repo.Http(GetUserByName)", err)
}
return
}
@@ -60,7 +89,7 @@ func Http(ctx *middleware.Context, params martini.Params) {
if err == models.ErrRepoNotExist {
ctx.Handle(404, "repo.Http(GetRepositoryByName)", nil)
} else {
- ctx.Handle(500, "repo.Http(GetRepositoryByName)", nil)
+ ctx.Handle(500, "repo.Http(GetRepositoryByName)", err)
}
return
}
@@ -75,7 +104,6 @@ func Http(ctx *middleware.Context, params martini.Params) {
if askAuth {
baHead := ctx.Req.Header.Get("Authorization")
if baHead == "" {
- // ask auth
authRequired(ctx)
return
}
@@ -142,7 +170,7 @@ func Http(ctx *middleware.Context, params martini.Params) {
if head[0] == '0' && head[1] == '0' {
size, err := strconv.ParseInt(string(input[lastLine+2:lastLine+4]), 16, 32)
if err != nil {
- log.Error("%v", err)
+ log.Error(4, "%v", err)
return
}
@@ -166,7 +194,6 @@ func Http(ctx *middleware.Context, params martini.Params) {
}
lastLine = lastLine + size
} else {
- //fmt.Println("ddddddddddd")
break
}
}
@@ -176,7 +203,7 @@ func Http(ctx *middleware.Context, params martini.Params) {
config := Config{setting.RepoRootPath, "git", true, true, f}
handler := HttpBackend(&config)
- handler(ctx.ResponseWriter, ctx.Req)
+ handler(ctx.Resp, ctx.Req)
}
type route struct {
@@ -229,7 +256,7 @@ func HttpBackend(config *Config) http.HandlerFunc {
dir, err := getGitDir(config, m[1])
if err != nil {
- log.GitLogger.Error(err.Error())
+ log.GitLogger.Error(4, err.Error())
renderNotFound(w)
return
}
@@ -283,7 +310,7 @@ func serviceRpc(rpc string, hr handler) {
err := cmd.Run()
if err != nil {
- log.GitLogger.Error(err.Error())
+ log.GitLogger.Error(4, err.Error())
return
}
@@ -366,7 +393,7 @@ func getGitDir(config *Config, fPath string) (string, error) {
cwd, err := os.Getwd()
if err != nil {
- log.GitLogger.Error(err.Error())
+ log.GitLogger.Error(4, err.Error())
return "", err
}
@@ -443,7 +470,7 @@ func gitCommand(gitBinPath, dir string, args ...string) []byte {
out, err := command.Output()
if err != nil {
- log.GitLogger.Error(err.Error())
+ log.GitLogger.Error(4, err.Error())
}
return out
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index c033e0f31c..ab9b2b646e 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -9,13 +9,12 @@ import (
"fmt"
"io"
"io/ioutil"
- "mime"
+ "net/http"
"net/url"
"strings"
"time"
"github.com/Unknwon/com"
- "github.com/go-martini/martini"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
@@ -74,7 +73,7 @@ func Issues(ctx *middleware.Context) {
}
var mid int64
- midx, _ := base.StrTo(ctx.Query("milestone")).Int64()
+ midx, _ := com.StrTo(ctx.Query("milestone")).Int64()
if midx > 0 {
mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, midx)
if err != nil {
@@ -95,7 +94,7 @@ func Issues(ctx *middleware.Context) {
}
ctx.Data["Labels"] = labels
- page, _ := base.StrTo(ctx.Query("page")).Int()
+ page, _ := com.StrTo(ctx.Query("page")).Int()
// Get issues.
issues, err := models.GetIssues(assigneeId, ctx.Repo.Repository.Id, posterId, mid, page,
@@ -115,7 +114,7 @@ func Issues(ctx *middleware.Context) {
// Get posters.
for i := range issues {
if err = issues[i].GetLabels(); err != nil {
- ctx.Handle(500, "issue.Issues(GetLabels)", fmt.Errorf("[#%d]%v", issues[i].Id, err))
+ ctx.Handle(500, "GetLabels", fmt.Errorf("[#%d]%v", issues[i].Id, err))
return
}
@@ -143,7 +142,7 @@ func Issues(ctx *middleware.Context) {
}
issueStats := models.GetIssueStats(ctx.Repo.Repository.Id, uid, isShowClosed, filterMode)
ctx.Data["IssueStats"] = issueStats
- ctx.Data["SelectLabels"], _ = base.StrTo(selectLabels).Int64()
+ ctx.Data["SelectLabels"], _ = com.StrTo(selectLabels).Int64()
ctx.Data["ViewType"] = viewType
ctx.Data["Issues"] = issues
ctx.Data["IsShowClosed"] = isShowClosed
@@ -156,7 +155,7 @@ func Issues(ctx *middleware.Context) {
ctx.HTML(200, ISSUES)
}
-func CreateIssue(ctx *middleware.Context, params martini.Params) {
+func CreateIssue(ctx *middleware.Context) {
ctx.Data["Title"] = "Create issue"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = false
@@ -187,34 +186,46 @@ func CreateIssue(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, ISSUE_CREATE)
}
-func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
- ctx.Data["Title"] = "Create issue"
- ctx.Data["IsRepoToolbarIssues"] = true
- ctx.Data["IsRepoToolbarIssuesList"] = false
- ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled
+func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
+ send := func(status int, data interface{}, err error) {
+ if err != nil {
+ log.Error(4, "issue.CreateIssuePost(?): %s", err)
+
+ ctx.JSON(status, map[string]interface{}{
+ "ok": false,
+ "status": status,
+ "error": err.Error(),
+ })
+ } else {
+ ctx.JSON(status, map[string]interface{}{
+ "ok": true,
+ "status": status,
+ "data": data,
+ })
+ }
+ }
var err error
// Get all milestones.
- ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, false)
+ _, err = models.GetMilestones(ctx.Repo.Repository.Id, false)
if err != nil {
- ctx.Handle(500, "issue.ViewIssue(GetMilestones.1): %v", err)
+ send(500, nil, err)
return
}
- ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, true)
+ _, err = models.GetMilestones(ctx.Repo.Repository.Id, true)
if err != nil {
- ctx.Handle(500, "issue.ViewIssue(GetMilestones.2): %v", err)
+ send(500, nil, err)
return
}
- us, err := models.GetCollaborators(strings.TrimPrefix(ctx.Repo.RepoLink, "/"))
+ _, err = models.GetCollaborators(strings.TrimPrefix(ctx.Repo.RepoLink, "/"))
if err != nil {
- ctx.Handle(500, "issue.CreateIssue(GetCollaborators)", err)
+ send(500, nil, err)
return
}
- ctx.Data["Collaborators"] = us
if ctx.HasError() {
- ctx.HTML(200, ISSUE_CREATE)
+ send(400, nil, errors.New(ctx.Flash.ErrorMsg))
return
}
@@ -233,11 +244,11 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
Content: form.Content,
}
if err := models.NewIssue(issue); err != nil {
- ctx.Handle(500, "issue.CreateIssue(NewIssue)", err)
+ send(500, nil, err)
return
} else if err := models.NewIssueUserPairs(issue.RepoId, issue.Id, ctx.Repo.Owner.Id,
ctx.User.Id, form.AssigneeId, ctx.Repo.Repository.Name); err != nil {
- ctx.Handle(500, "issue.CreateIssue(NewIssueUserPairs)", err)
+ send(500, nil, err)
return
}
@@ -252,9 +263,8 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
ms[i] = ms[i][1:]
}
- ids := models.GetUserIdsByNames(ms)
- if err := models.UpdateIssueUserPairsByMentions(ids, issue.Id); err != nil {
- ctx.Handle(500, "issue.CreateIssue(UpdateIssueUserPairsByMentions)", err)
+ if err := models.UpdateMentions(ms, issue.Id); err != nil {
+ send(500, nil, err)
return
}
}
@@ -263,7 +273,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
ActUserId: ctx.User.Id,
ActUserName: ctx.User.Name,
ActEmail: ctx.User.Email,
- OpType: models.OP_CREATE_ISSUE,
+ OpType: models.CREATE_ISSUE,
Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name),
RepoId: ctx.Repo.Repository.Id,
RepoUserName: ctx.Repo.Owner.Name,
@@ -273,7 +283,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
}
// Notify watchers.
if err := models.NotifyWatchers(act); err != nil {
- ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err)
+ send(500, nil, err)
return
}
@@ -281,7 +291,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
if setting.Service.EnableNotifyMail {
tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue)
if err != nil {
- ctx.Handle(500, "issue.CreateIssue(SendIssueNotifyMail)", err)
+ send(500, nil, err)
return
}
@@ -296,13 +306,13 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C
}
if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner,
ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil {
- ctx.Handle(500, "issue.CreateIssue(SendIssueMentionMail)", err)
+ send(500, nil, err)
return
}
}
log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id)
- ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index))
+ send(200, fmt.Sprintf("/%s/%s/issues/%d", ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil)
}
func checkLabels(labels, allLabels []*models.Label) {
@@ -316,10 +326,10 @@ func checkLabels(labels, allLabels []*models.Label) {
}
}
-func ViewIssue(ctx *middleware.Context, params martini.Params) {
+func ViewIssue(ctx *middleware.Context) {
ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled
- idx, _ := base.StrTo(params["index"]).Int64()
+ idx := com.StrTo(ctx.Params(":index")).MustInt64()
if idx == 0 {
ctx.Handle(404, "issue.ViewIssue", nil)
return
@@ -430,8 +440,8 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, ISSUE_VIEW)
}
-func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
- idx, _ := base.StrTo(params["index"]).Int64()
+func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) {
+ idx := com.StrTo(ctx.Params(":index")).MustInt64()
if idx <= 0 {
ctx.Error(404)
return
@@ -473,13 +483,13 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
})
}
-func UpdateIssueLabel(ctx *middleware.Context, params martini.Params) {
+func UpdateIssueLabel(ctx *middleware.Context) {
if !ctx.Repo.IsOwner {
ctx.Error(403)
return
}
- idx, _ := base.StrTo(params["index"]).Int64()
+ idx := com.StrTo(ctx.Params(":index")).MustInt64()
if idx <= 0 {
ctx.Error(404)
return
@@ -497,7 +507,7 @@ func UpdateIssueLabel(ctx *middleware.Context, params martini.Params) {
isAttach := ctx.Query("action") == "attach"
labelStrId := ctx.Query("id")
- labelId, _ := base.StrTo(labelStrId).Int64()
+ labelId := com.StrTo(labelStrId).MustInt64()
label, err := models.GetLabelById(labelId)
if err != nil {
if err == models.ErrLabelNotExist {
@@ -555,8 +565,8 @@ func UpdateIssueMilestone(ctx *middleware.Context) {
return
}
- issueId, err := base.StrTo(ctx.Query("issue")).Int64()
- if err != nil {
+ issueId := com.StrTo(ctx.Params(":issue")).MustInt64()
+ if issueId == 0 {
ctx.Error(404)
return
}
@@ -572,7 +582,7 @@ func UpdateIssueMilestone(ctx *middleware.Context) {
}
oldMid := issue.MilestoneId
- mid, _ := base.StrTo(ctx.Query("milestone")).Int64()
+ mid := com.StrTo(ctx.Params(":milestone")).MustInt64()
if oldMid == mid {
ctx.JSON(200, map[string]interface{}{
"ok": true,
@@ -601,8 +611,8 @@ func UpdateAssignee(ctx *middleware.Context) {
return
}
- issueId, err := base.StrTo(ctx.Query("issue")).Int64()
- if err != nil {
+ issueId := com.StrTo(ctx.Params(":index")).MustInt64()
+ if issueId == 0 {
ctx.Error(404)
return
}
@@ -610,21 +620,21 @@ func UpdateAssignee(ctx *middleware.Context) {
issue, err := models.GetIssueById(issueId)
if err != nil {
if err == models.ErrIssueNotExist {
- ctx.Handle(404, "issue.UpdateAssignee(GetIssueById)", err)
+ ctx.Handle(404, "GetIssueById", err)
} else {
- ctx.Handle(500, "issue.UpdateAssignee(GetIssueById)", err)
+ ctx.Handle(500, "GetIssueById", err)
}
return
}
- aid, _ := base.StrTo(ctx.Query("assigneeid")).Int64()
+ aid := com.StrTo(ctx.Params(":assigneeid")).MustInt64()
// Not check for invalid assignne id and give responsibility to owners.
issue.AssigneeId = aid
if err = models.UpdateIssueUserPairByAssignee(aid, issue.Id); err != nil {
- ctx.Handle(500, "issue.UpdateAssignee(UpdateIssueUserPairByAssignee): %v", err)
+ ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err)
return
} else if err = models.UpdateIssue(issue); err != nil {
- ctx.Handle(500, "issue.UpdateAssignee(UpdateIssue)", err)
+ ctx.Handle(500, "UpdateIssue", err)
return
}
@@ -656,8 +666,15 @@ func uploadFiles(ctx *middleware.Context, issueId, commentId int64) {
defer file.Close()
+ buf := make([]byte, 1024)
+ n, _ := file.Read(buf)
+ if n > 0 {
+ buf = buf[:n]
+ }
+ fileType := http.DetectContentType(buf)
+ fmt.Println(fileType)
+
allowed := false
- fileType := mime.TypeByExtension(header.Filename)
for _, t := range allowedTypes {
t := strings.Trim(t, " ")
@@ -676,42 +693,60 @@ func uploadFiles(ctx *middleware.Context, issueId, commentId int64) {
out, err := ioutil.TempFile(setting.AttachmentPath, "attachment_")
if err != nil {
- ctx.Handle(500, "issue.Comment(ioutil.TempFile)", err)
+ ctx.Handle(500, "ioutil.TempFile", err)
return
}
defer out.Close()
+ out.Write(buf)
_, err = io.Copy(out, file)
-
if err != nil {
- ctx.Handle(500, "issue.Comment(io.Copy)", err)
+ ctx.Handle(500, "io.Copy", err)
return
}
_, err = models.CreateAttachment(issueId, commentId, header.Filename, out.Name())
-
if err != nil {
- ctx.Handle(500, "issue.Comment(io.Copy)", err)
+ ctx.Handle(500, "CreateAttachment", err)
return
}
}
}
-func Comment(ctx *middleware.Context, params martini.Params) {
- index, err := base.StrTo(ctx.Query("issueIndex")).Int64()
- if err != nil {
- ctx.Handle(404, "issue.Comment(get index)", err)
+func Comment(ctx *middleware.Context) {
+ send := func(status int, data interface{}, err error) {
+ if err != nil {
+ log.Error(4, "issue.Comment(?): %s", err)
+
+ ctx.JSON(status, map[string]interface{}{
+ "ok": false,
+ "status": status,
+ "error": err.Error(),
+ })
+ } else {
+ ctx.JSON(status, map[string]interface{}{
+ "ok": true,
+ "status": status,
+ "data": data,
+ })
+ }
+ }
+
+ index := com.StrTo(ctx.Query("issueIndex")).MustInt64()
+ if index == 0 {
+ ctx.Error(404)
return
}
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index)
if err != nil {
if err == models.ErrIssueNotExist {
- ctx.Handle(404, "issue.Comment", err)
+ send(404, nil, err)
} else {
- ctx.Handle(200, "issue.Comment(get issue)", err)
+ send(200, nil, err)
}
+
return
}
@@ -725,17 +760,17 @@ func Comment(ctx *middleware.Context, params martini.Params) {
(strings.Contains(newStatus, "Close") && !issue.IsClosed) {
issue.IsClosed = !issue.IsClosed
if err = models.UpdateIssue(issue); err != nil {
- ctx.Handle(500, "issue.Comment(UpdateIssue)", err)
+ send(500, nil, err)
return
} else if err = models.UpdateIssueUserPairsByStatus(issue.Id, issue.IsClosed); err != nil {
- ctx.Handle(500, "issue.Comment(UpdateIssueUserPairsByStatus)", err)
+ send(500, nil, err)
return
}
// Change open/closed issue counter for the associated milestone
if issue.MilestoneId > 0 {
if err = models.ChangeMilestoneIssueStats(issue); err != nil {
- ctx.Handle(500, "issue.Comment(ChangeMilestoneIssueStats)", err)
+ send(500, nil, err)
}
}
@@ -745,7 +780,7 @@ func Comment(ctx *middleware.Context, params martini.Params) {
}
if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, cmtType, "", nil); err != nil {
- ctx.Handle(200, "issue.Comment(create status change comment)", err)
+ send(200, nil, err)
return
}
log.Trace("%s Issue(%d) status changed: %v", ctx.Req.RequestURI, issue.Id, !issue.IsClosed)
@@ -756,11 +791,12 @@ func Comment(ctx *middleware.Context, params martini.Params) {
var ms []string
content := ctx.Query("content")
- if len(content) > 0 {
- switch params["action"] {
+ // Fix #321. Allow empty comments, as long as we have attachments.
+ if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 {
+ switch ctx.Params(":action") {
case "new":
if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, models.COMMENT, content, nil); err != nil {
- ctx.Handle(500, "issue.Comment(create comment)", err)
+ send(500, nil, err)
return
}
@@ -771,9 +807,8 @@ func Comment(ctx *middleware.Context, params martini.Params) {
ms[i] = ms[i][1:]
}
- ids := models.GetUserIdsByNames(ms)
- if err := models.UpdateIssueUserPairsByMentions(ids, issue.Id); err != nil {
- ctx.Handle(500, "issue.CreateIssue(UpdateIssueUserPairsByMentions)", err)
+ if err := models.UpdateMentions(ms, issue.Id); err != nil {
+ send(500, nil, err)
return
}
}
@@ -794,14 +829,14 @@ func Comment(ctx *middleware.Context, params martini.Params) {
ActUserId: ctx.User.Id,
ActUserName: ctx.User.LowerName,
ActEmail: ctx.User.Email,
- OpType: models.OP_COMMENT_ISSUE,
+ OpType: models.COMMENT_ISSUE,
Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]),
RepoId: ctx.Repo.Repository.Id,
RepoUserName: ctx.Repo.Owner.LowerName,
RepoName: ctx.Repo.Repository.LowerName,
}
if err = models.NotifyWatchers(act); err != nil {
- ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err)
+ send(500, nil, err)
return
}
@@ -810,7 +845,7 @@ func Comment(ctx *middleware.Context, params martini.Params) {
issue.Content = content
tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue)
if err != nil {
- ctx.Handle(500, "issue.Comment(SendIssueNotifyMail)", err)
+ send(500, nil, err)
return
}
@@ -825,12 +860,12 @@ func Comment(ctx *middleware.Context, params martini.Params) {
}
if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner,
ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil {
- ctx.Handle(500, "issue.Comment(SendIssueMentionMail)", err)
+ send(500, nil, err)
return
}
}
- ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, index))
+ send(200, fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, index), nil)
}
func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) {
@@ -851,8 +886,8 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) {
ctx.Redirect(ctx.Repo.RepoLink + "/issues")
}
-func UpdateLabel(ctx *middleware.Context, params martini.Params, form auth.CreateLabelForm) {
- id, _ := base.StrTo(ctx.Query("id")).Int64()
+func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) {
+ id := com.StrTo(ctx.Query("id")).MustInt64()
if id == 0 {
ctx.Error(404)
return
@@ -961,12 +996,12 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones")
}
-func UpdateMilestone(ctx *middleware.Context, params martini.Params) {
+func UpdateMilestone(ctx *middleware.Context) {
ctx.Data["Title"] = "Update Milestone"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true
- idx, _ := base.StrTo(params["index"]).Int64()
+ idx := com.StrTo(ctx.Params(":index")).MustInt64()
if idx == 0 {
ctx.Handle(404, "issue.UpdateMilestone", nil)
return
@@ -982,7 +1017,7 @@ func UpdateMilestone(ctx *middleware.Context, params martini.Params) {
return
}
- action := params["action"]
+ action := ctx.Params(":action")
if len(action) > 0 {
switch action {
case "open":
@@ -1019,12 +1054,12 @@ func UpdateMilestone(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, MILESTONE_EDIT)
}
-func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form auth.CreateMilestoneForm) {
+func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
ctx.Data["Title"] = "Update Milestone"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true
- idx, _ := base.StrTo(params["index"]).Int64()
+ idx := com.StrTo(ctx.Params(":index")).MustInt64()
if idx == 0 {
ctx.Handle(404, "issue.UpdateMilestonePost", nil)
return
@@ -1066,11 +1101,10 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au
ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones")
}
-func IssueGetAttachment(ctx *middleware.Context, params martini.Params) {
- id, err := base.StrTo(params["id"]).Int64()
-
- if err != nil {
- ctx.Handle(400, "issue.IssueGetAttachment(base.StrTo.Int64)", err)
+func IssueGetAttachment(ctx *middleware.Context) {
+ id := com.StrTo(ctx.Params(":id")).MustInt64()
+ if id == 0 {
+ ctx.Error(404)
return
}
@@ -1081,5 +1115,7 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) {
return
}
- ctx.ServeFile(attachment.Path, attachment.Name)
+ // Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
+ // We must put the name in " manually.
+ ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"")
}
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index db208f9fbc..d379a54eaa 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -5,8 +5,6 @@
package repo
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware"
)
@@ -15,7 +13,7 @@ const (
PULLS base.TplName = "repo/pulls"
)
-func Pulls(ctx *middleware.Context, params martini.Params) {
+func Pulls(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarPulls"] = true
ctx.HTML(200, PULLS)
}
diff --git a/routers/repo/release.go b/routers/repo/release.go
index a901436fc0..addeb1ce5f 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -5,8 +5,6 @@
package repo
import (
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
@@ -54,7 +52,7 @@ func Releases(ctx *middleware.Context) {
if rel.TagName == rawTag {
rel.Publisher, err = models.GetUserById(rel.PublisherId)
if err != nil {
- ctx.Handle(500, "release.Releases(GetUserById)", err)
+ ctx.Handle(500, "GetUserById", err)
return
}
// Get corresponding target if it's not the current branch.
@@ -63,12 +61,12 @@ func Releases(ctx *middleware.Context) {
if _, ok := countCache[rel.Target]; !ok {
commit, err := ctx.Repo.GitRepo.GetCommitOfTag(rel.TagName)
if err != nil {
- ctx.Handle(500, "release.Releases(GetCommitOfTag)", err)
+ ctx.Handle(500, "GetCommitOfTag", err)
return
}
countCache[rel.Target], err = commit.CommitsCount()
if err != nil {
- ctx.Handle(500, "release.Releases(CommitsCount2)", err)
+ ctx.Handle(500, "CommitsCount2", err)
return
}
}
@@ -86,7 +84,7 @@ func Releases(ctx *middleware.Context) {
if tags[i] == nil {
commit, err := ctx.Repo.GitRepo.GetCommitOfTag(rawTag)
if err != nil {
- ctx.Handle(500, "release.Releases(GetCommitOfTag2)", err)
+ ctx.Handle(500, "GetCommitOfTag2", err)
return
}
@@ -98,7 +96,7 @@ func Releases(ctx *middleware.Context) {
tags[i].NumCommits, err = ctx.Repo.GitRepo.CommitsCount(commit.Id.String())
if err != nil {
- ctx.Handle(500, "release.Releases(CommitsCount)", err)
+ ctx.Handle(500, "CommitsCount", err)
return
}
tags[i].NumCommitsBehind = commitsCount - tags[i].NumCommits
@@ -173,13 +171,13 @@ func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) {
ctx.Redirect(ctx.Repo.RepoLink + "/releases")
}
-func EditRelease(ctx *middleware.Context, params martini.Params) {
+func EditRelease(ctx *middleware.Context) {
if !ctx.Repo.IsOwner {
ctx.Handle(403, "release.ReleasesEdit", nil)
return
}
- tagName := params["tagname"]
+ tagName := ctx.Params(":tagname")
rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName)
if err != nil {
if err == models.ErrReleaseNotExist {
@@ -196,13 +194,13 @@ func EditRelease(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, RELEASE_EDIT)
}
-func EditReleasePost(ctx *middleware.Context, params martini.Params, form auth.EditReleaseForm) {
+func EditReleasePost(ctx *middleware.Context, form auth.EditReleaseForm) {
if !ctx.Repo.IsOwner {
ctx.Handle(403, "release.EditReleasePost", nil)
return
}
- tagName := params["tagname"]
+ tagName := ctx.Params(":tagname")
rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName)
if err != nil {
if err == models.ErrReleaseNotExist {
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 44a2b84f80..8de1e0936e 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -5,22 +5,17 @@
package repo
import (
- "bytes"
- "encoding/base64"
- "errors"
"fmt"
- "io/ioutil"
+ "os"
"path"
- "path/filepath"
"strings"
- "github.com/go-martini/martini"
-
- "github.com/gogits/git"
+ "github.com/Unknwon/com"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/git"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
)
@@ -28,17 +23,20 @@ import (
const (
CREATE base.TplName = "repo/create"
MIGRATE base.TplName = "repo/migrate"
- SINGLE base.TplName = "repo/single"
)
func Create(ctx *middleware.Context) {
- ctx.Data["Title"] = "Create repository"
- ctx.Data["PageIsNewRepo"] = true
- ctx.Data["LanguageIgns"] = models.LanguageIgns
+ ctx.Data["Title"] = ctx.Tr("new_repo")
+ ctx.Data["PageIsRepoCreate"] = true
+
+ // Give default value for template to render.
+ ctx.Data["gitignore"] = "0"
+ ctx.Data["license"] = "0"
+ ctx.Data["Gitignores"] = models.Gitignores
ctx.Data["Licenses"] = models.Licenses
ctxUser := ctx.User
- orgId, _ := base.StrTo(ctx.Query("org")).Int64()
+ orgId := com.StrTo(ctx.Query("org")).MustInt64()
if orgId > 0 {
org, err := models.GetUserById(orgId)
if err != nil && err != models.ErrUserNotExist {
@@ -59,11 +57,24 @@ func Create(ctx *middleware.Context) {
}
func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
- ctx.Data["Title"] = "Create repository"
- ctx.Data["PageIsNewRepo"] = true
- ctx.Data["LanguageIgns"] = models.LanguageIgns
+ ctx.Data["Title"] = ctx.Tr("new_repo")
+ ctx.Data["PageIsRepoCreate"] = true
+
+ ctx.Data["Gitignores"] = models.Gitignores
ctx.Data["Licenses"] = models.Licenses
+ ctxUser := ctx.User
+ orgId := com.StrTo(ctx.Query("org")).MustInt64()
+ if orgId > 0 {
+ org, err := models.GetUserById(orgId)
+ if err != nil && err != models.ErrUserNotExist {
+ ctx.Handle(500, "home.Dashboard(GetUserById)", err)
+ return
+ }
+ ctxUser = org
+ }
+ ctx.Data["ContextUser"] = ctxUser
+
if err := ctx.User.GetOrganizations(); err != nil {
ctx.Handle(500, "home.CreatePost(GetOrganizations)", err)
return
@@ -97,25 +108,25 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
}
repo, err := models.CreateRepository(u, form.RepoName, form.Description,
- form.Language, form.License, form.Private, false, form.InitReadme)
+ form.Gitignore, form.License, form.Private, false, form.InitReadme)
if err == nil {
- log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName)
+ log.Trace("Repository created: %s/%s", u.Name, form.RepoName)
ctx.Redirect("/" + u.Name + "/" + form.RepoName)
return
} else if err == models.ErrRepoAlreadyExist {
- ctx.RenderWithErr("Repository name has already been used", CREATE, &form)
+ ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), CREATE, &form)
return
} else if err == models.ErrRepoNameIllegal {
- ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), CREATE, &form)
+ ctx.RenderWithErr(ctx.Tr("form.illegal_repo_name"), CREATE, &form)
return
}
if repo != nil {
if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
- log.Error("repo.CreatePost(DeleteRepository): %v", errDelete)
+ log.Error(4, "DeleteRepository: %v", errDelete)
}
}
- ctx.Handle(500, "repo.CreatePost(CreateRepository)", err)
+ ctx.Handle(500, "CreateRepository", err)
}
func Migrate(ctx *middleware.Context) {
@@ -180,7 +191,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
if repo != nil {
if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil {
- log.Error("repo.MigratePost(DeleteRepository): %v", errDelete)
+ log.Error(4, "DeleteRepository: %v", errDelete)
}
}
@@ -188,246 +199,68 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
ctx.RenderWithErr(err.Error(), MIGRATE, &form)
return
}
- ctx.Handle(500, "repo.Migrate(MigrateRepository)", err)
+ ctx.Handle(500, "MigrateRepository", err)
}
-func Single(ctx *middleware.Context, params martini.Params) {
- branchName := ctx.Repo.BranchName
- userName := ctx.Repo.Owner.Name
- repoName := ctx.Repo.Repository.Name
+// func Action(ctx *middleware.Context, params martini.Params) {
+// var err error
+// switch params["action"] {
+// case "watch":
+// err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true)
+// case "unwatch":
+// err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false)
+// case "desc":
+// if !ctx.Repo.IsOwner {
+// ctx.Error(404)
+// return
+// }
- repoLink := ctx.Repo.RepoLink
- branchLink := ctx.Repo.RepoLink + "/src/" + branchName
- rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
+// ctx.Repo.Repository.Description = ctx.Query("desc")
+// ctx.Repo.Repository.Website = ctx.Query("site")
+// err = models.UpdateRepository(ctx.Repo.Repository)
+// }
- // Get tree path
- treename := params["_1"]
+// if err != nil {
+// log.Error("repo.Action(%s): %v", params["action"], err)
+// ctx.JSON(200, map[string]interface{}{
+// "ok": false,
+// "err": err.Error(),
+// })
+// return
+// }
+// ctx.JSON(200, map[string]interface{}{
+// "ok": true,
+// })
+// }
- if len(treename) > 0 && treename[len(treename)-1] == '/' {
- ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1])
+func Download(ctx *middleware.Context) {
+ ext := "." + ctx.Params(":ext")
+
+ var archivePath string
+ switch ext {
+ case ".zip":
+ archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/zip")
+ case ".tar.gz":
+ archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz")
+ default:
+ ctx.Error(404)
return
}
- ctx.Data["IsRepoToolbarSource"] = true
-
- isViewBranch := ctx.Repo.IsBranch
- ctx.Data["IsViewBranch"] = isViewBranch
-
- treePath := treename
- if len(treePath) != 0 {
- treePath = treePath + "/"
- }
-
- entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename)
- if err != nil && err != git.ErrNotExist {
- ctx.Handle(404, "repo.Single(GetTreeEntryByPath)", err)
- return
- }
-
- if len(treename) != 0 && entry == nil {
- ctx.Handle(404, "repo.Single", nil)
- return
- }
-
- if entry != nil && !entry.IsDir() {
- blob := entry.Blob()
-
- if dataRc, err := blob.Data(); err != nil {
- ctx.Handle(404, "repo.Single(blob.Data)", err)
- } else {
- ctx.Data["FileSize"] = blob.Size()
- ctx.Data["IsFile"] = true
- ctx.Data["FileName"] = blob.Name()
- ext := path.Ext(blob.Name())
- if len(ext) > 0 {
- ext = ext[1:]
- }
- ctx.Data["FileExt"] = ext
- ctx.Data["FileLink"] = rawLink + "/" + treename
-
- buf := make([]byte, 1024)
- n, _ := dataRc.Read(buf)
- if n > 0 {
- buf = buf[:n]
- }
-
- defer func() {
- dataRc.Close()
- }()
-
- _, isTextFile := base.IsTextFile(buf)
- _, isImageFile := base.IsImageFile(buf)
- ctx.Data["FileIsText"] = isTextFile
-
- switch {
- case isImageFile:
- ctx.Data["IsImageFile"] = true
- case isTextFile:
- d, _ := ioutil.ReadAll(dataRc)
- buf = append(buf, d...)
- readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name())
- ctx.Data["ReadmeExist"] = readmeExist
- if readmeExist {
- ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, ""))
- } else {
- ctx.Data["FileContent"] = string(buf)
- }
- }
- }
-
- } else {
- // Directory and file list.
- tree, err := ctx.Repo.Commit.SubTree(treename)
- if err != nil {
- ctx.Handle(404, "repo.Single(SubTree)", err)
+ if !com.IsDir(archivePath) {
+ if err := os.MkdirAll(archivePath, os.ModePerm); err != nil {
+ ctx.Handle(500, "Download -> os.MkdirAll(archivePath)", err)
return
}
- entries := tree.ListEntries()
- entries.Sort()
-
- files := make([][]interface{}, 0, len(entries))
-
- for _, te := range entries {
- c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name()))
- if err != nil {
- ctx.Handle(404, "repo.Single(SubTree)", err)
- return
- }
-
- files = append(files, []interface{}{te, c})
- }
-
- ctx.Data["Files"] = files
-
- var readmeFile *git.Blob
-
- for _, f := range entries {
- if f.IsDir() || !base.IsReadmeFile(f.Name()) {
- continue
- } else {
- readmeFile = f.Blob()
- break
- }
- }
-
- if readmeFile != nil {
- ctx.Data["ReadmeInSingle"] = true
- ctx.Data["ReadmeExist"] = true
- if dataRc, err := readmeFile.Data(); err != nil {
- ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err)
- return
- } else {
-
- buf := make([]byte, 1024)
- n, _ := dataRc.Read(buf)
- if n > 0 {
- buf = buf[:n]
- }
- defer func() {
- dataRc.Close()
- }()
-
- ctx.Data["FileSize"] = readmeFile.Size
- ctx.Data["FileLink"] = rawLink + "/" + treename
- _, isTextFile := base.IsTextFile(buf)
- ctx.Data["FileIsText"] = isTextFile
- ctx.Data["FileName"] = readmeFile.Name()
- if isTextFile {
- d, _ := ioutil.ReadAll(dataRc)
- buf = append(buf, d...)
- switch {
- case base.IsMarkdownFile(readmeFile.Name()):
- buf = base.RenderMarkdown(buf, branchLink)
- default:
- buf = bytes.Replace(buf, []byte("\n"), []byte(`
`), -1) - } - ctx.Data["FileContent"] = string(buf) - } - } - } } - ctx.Data["Username"] = userName - ctx.Data["Reponame"] = repoName - - var treenames []string - Paths := make([]string, 0) - - if len(treename) > 0 { - treenames = strings.Split(treename, "/") - for i, _ := range treenames { - Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) - } - - ctx.Data["HasParentPath"] = true - if len(Paths)-2 >= 0 { - ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] - } - } - - ctx.Data["LastCommit"] = ctx.Repo.Commit - ctx.Data["Paths"] = Paths - ctx.Data["TreeName"] = treename - ctx.Data["Treenames"] = treenames - ctx.Data["TreePath"] = treePath - ctx.Data["BranchLink"] = branchLink - ctx.HTML(200, SINGLE) -} - -func basicEncode(username, password string) string { - auth := username + ":" + password - return base64.StdEncoding.EncodeToString([]byte(auth)) -} - -func basicDecode(encoded string) (user string, name string, err error) { - var s []byte - s, err = base64.StdEncoding.DecodeString(encoded) - if err != nil { - return - } - - a := strings.Split(string(s), ":") - if len(a) == 2 { - user, name = a[0], a[1] - } else { - err = errors.New("decode failed") - } - return -} - -func authRequired(ctx *middleware.Context) { - ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"") - ctx.Data["ErrorMsg"] = "no basic auth and digit auth" - ctx.HTML(401, base.TplName("status/401")) -} - -func Action(ctx *middleware.Context, params martini.Params) { - var err error - switch params["action"] { - case "watch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) - case "unwatch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) - case "desc": - if !ctx.Repo.IsOwner { - ctx.Error(404) + archivePath = path.Join(archivePath, ctx.Repo.CommitId+ext) + if !com.IsFile(archivePath) { + if err := ctx.Repo.Commit.CreateArchive(archivePath, git.ZIP); err != nil { + ctx.Handle(500, "Download -> CreateArchive "+archivePath, err) return } - - ctx.Repo.Repository.Description = ctx.Query("desc") - ctx.Repo.Repository.Website = ctx.Query("site") - err = models.UpdateRepository(ctx.Repo.Repository) } - if err != nil { - log.Error("repo.Action(%s): %v", params["action"], err) - ctx.JSON(200, map[string]interface{}{ - "ok": false, - "err": err.Error(), - }) - return - } - ctx.JSON(200, map[string]interface{}{ - "ok": true, - }) + ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(ctx.Repo.CommitId)+ext) } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 5a57f76075..26f391346e 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-martini/martini" + "github.com/Unknwon/com" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -74,7 +74,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Repository.IsPrivate = form.Private ctx.Repo.Repository.IsGoget = form.GoGet if err := models.UpdateRepository(ctx.Repo.Repository); err != nil { - ctx.Handle(404, "setting.SettingPost(update)", err) + ctx.Handle(404, "UpdateRepository", err) return } log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) @@ -84,7 +84,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Mirror.Interval = form.Interval ctx.Repo.Mirror.NextUpdate = time.Now().Add(time.Duration(form.Interval) * time.Hour) if err := models.UpdateMirror(ctx.Repo.Mirror); err != nil { - log.Error("setting.SettingPost(UpdateMirror): %v", err) + log.Error(4, "UpdateMirror: %v", err) } } } @@ -227,7 +227,7 @@ func WebHooks(ctx *middleware.Context) { ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhooks" // Delete webhook. - remove, _ := base.StrTo(ctx.Query("remove")).Int64() + remove := com.StrTo(ctx.Query("remove")).MustInt64() if remove > 0 { if err := models.DeleteWebhook(remove); err != nil { ctx.Handle(500, "setting.WebHooks(DeleteWebhook)", err) @@ -290,11 +290,11 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks") } -func WebHooksEdit(ctx *middleware.Context, params martini.Params) { +func WebHooksEdit(ctx *middleware.Context) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEdit", nil) return @@ -315,11 +315,11 @@ func WebHooksEdit(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, HOOK_EDIT) } -func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth.NewWebhookForm) { +func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEditPost", nil) return @@ -328,9 +328,9 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. w, err := models.GetWebhookById(hookId) if err != nil { if err == models.ErrWebhookNotExist { - ctx.Handle(404, "setting.WebHooksEditPost(GetWebhookById)", nil) + ctx.Handle(404, "GetWebhookById", nil) } else { - ctx.Handle(500, "setting.WebHooksEditPost(GetWebhookById)", err) + ctx.Handle(500, "GetWebhookById", err) } return } @@ -353,10 +353,10 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. } w.IsActive = form.Active if err := w.UpdateEvent(); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(UpdateEvent)", err) + ctx.Handle(500, "UpdateEvent", err) return } else if err := models.UpdateWebhook(w); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(WebHooksEditPost)", err) + ctx.Handle(500, "WebHooksEditPost", err) return } diff --git a/routers/repo/view.go b/routers/repo/view.go new file mode 100644 index 0000000000..9562bb785b --- /dev/null +++ b/routers/repo/view.go @@ -0,0 +1,203 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "bytes" + "io/ioutil" + "path" + "path/filepath" + "strings" + + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" + "github.com/gogits/gogs/modules/middleware" +) + +const ( + HOME base.TplName = "repo/home" +) + +func Home(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Repo.Repository.Name + + branchName := ctx.Repo.BranchName + userName := ctx.Repo.Owner.Name + repoName := ctx.Repo.Repository.Name + + repoLink := ctx.Repo.RepoLink + branchLink := ctx.Repo.RepoLink + "/src/" + branchName + rawLink := ctx.Repo.RepoLink + "/raw/" + branchName + + // Get tree path + treename := ctx.Params("*") + + if len(treename) > 0 && treename[len(treename)-1] == '/' { + ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1]) + return + } + + ctx.Data["IsRepoToolbarSource"] = true + + isViewBranch := ctx.Repo.IsBranch + ctx.Data["IsViewBranch"] = isViewBranch + + treePath := treename + if len(treePath) != 0 { + treePath = treePath + "/" + } + + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) + if err != nil && err != git.ErrNotExist { + ctx.Handle(404, "GetTreeEntryByPath", err) + return + } + + if len(treename) != 0 && entry == nil { + ctx.Handle(404, "repo.Home", nil) + return + } + + if entry != nil && !entry.IsDir() { + blob := entry.Blob() + + if dataRc, err := blob.Data(); err != nil { + ctx.Handle(404, "blob.Data", err) + return + } else { + ctx.Data["FileSize"] = blob.Size() + ctx.Data["IsFile"] = true + ctx.Data["FileName"] = blob.Name() + ext := path.Ext(blob.Name()) + if len(ext) > 0 { + ext = ext[1:] + } + ctx.Data["FileExt"] = ext + ctx.Data["FileLink"] = rawLink + "/" + treename + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + _, isTextFile := base.IsTextFile(buf) + _, isImageFile := base.IsImageFile(buf) + ctx.Data["IsFileText"] = isTextFile + + switch { + case isImageFile: + ctx.Data["IsImageFile"] = true + case isTextFile: + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) + ctx.Data["ReadmeExist"] = readmeExist + if readmeExist { + ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, "")) + } else { + ctx.Data["FileContent"] = string(buf) + } + } + } + } else { + // Directory and file list. + tree, err := ctx.Repo.Commit.SubTree(treename) + if err != nil { + ctx.Handle(404, "SubTree", err) + return + } + entries, err := tree.ListEntries(treename) + if err != nil { + ctx.Handle(500, "ListEntries", err) + return + } + entries.Sort() + + files := make([][]interface{}, 0, len(entries)) + + for _, te := range entries { + c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) + if err != nil { + ctx.Handle(404, "GetCommitOfRelPath", err) + return + } + + files = append(files, []interface{}{te, c}) + } + + ctx.Data["Files"] = files + + var readmeFile *git.Blob + + for _, f := range entries { + if f.IsDir() || !base.IsReadmeFile(f.Name()) { + continue + } else { + readmeFile = f.Blob() + break + } + } + + if readmeFile != nil { + ctx.Data["ReadmeInHome"] = true + ctx.Data["ReadmeExist"] = true + if dataRc, err := readmeFile.Data(); err != nil { + ctx.Handle(404, "repo.SinglereadmeFile.LookupBlob", err) + return + } else { + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + ctx.Data["FileSize"] = readmeFile.Size() + ctx.Data["FileLink"] = rawLink + "/" + treename + _, isTextFile := base.IsTextFile(buf) + ctx.Data["FileIsText"] = isTextFile + ctx.Data["FileName"] = readmeFile.Name() + if isTextFile { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + switch { + case base.IsMarkdownFile(readmeFile.Name()): + buf = base.RenderMarkdown(buf, branchLink) + default: + buf = bytes.Replace(buf, []byte("\n"), []byte(`
`), -1) + } + ctx.Data["FileContent"] = string(buf) + } + } + } + } + + ctx.Data["Username"] = userName + ctx.Data["Reponame"] = repoName + + var treenames []string + Paths := make([]string, 0) + + if len(treename) > 0 { + treenames = strings.Split(treename, "/") + for i, _ := range treenames { + Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) + } + + ctx.Data["HasParentPath"] = true + if len(Paths)-2 >= 0 { + ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] + } + } + + ctx.Data["LastCommit"] = ctx.Repo.Commit + ctx.Data["Paths"] = Paths + ctx.Data["TreeName"] = treename + ctx.Data["Treenames"] = treenames + ctx.Data["TreePath"] = treePath + ctx.Data["BranchLink"] = branchLink + ctx.HTML(200, HOME) +} diff --git a/routers/user/auth.go b/routers/user/auth.go new file mode 100644 index 0000000000..163df34a4a --- /dev/null +++ b/routers/user/auth.go @@ -0,0 +1,442 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package user + +import ( + "net/url" + "strings" + + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/auth" + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/captcha" + "github.com/gogits/gogs/modules/log" + // "github.com/gogits/gogs/modules/mailer" + "github.com/gogits/gogs/modules/middleware" + "github.com/gogits/gogs/modules/setting" +) + +const ( + SIGNIN base.TplName = "user/signin" + SIGNUP base.TplName = "user/signup" + DELETE base.TplName = "user/delete" + ACTIVATE base.TplName = "user/activate" + FORGOT_PASSWORD base.TplName = "user/forgot_passwd" + RESET_PASSWORD base.TplName = "user/reset_passwd" +) + +func SignIn(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("sign_in") + + // if _, ok := ctx.Session.Get("socialId").(int64); ok { + // ctx.Data["IsSocialLogin"] = true + // ctx.HTML(200, SIGNIN) + // return + // } + + // if setting.OauthService != nil { + // ctx.Data["OauthEnabled"] = true + // ctx.Data["OauthService"] = setting.OauthService + // } + + // Check auto-login. + uname := ctx.GetCookie(setting.CookieUserName) + if len(uname) == 0 { + ctx.HTML(200, SIGNIN) + return + } + + isSucceed := false + defer func() { + if !isSucceed { + log.Trace("auto-login cookie cleared: %s", uname) + ctx.SetCookie(setting.CookieUserName, "", -1) + ctx.SetCookie(setting.CookieRememberName, "", -1) + return + } + }() + + u, err := models.GetUserByName(uname) + if err != nil { + if err != models.ErrUserNotExist { + ctx.Handle(500, "GetUserByName", err) + } + return + } + + if val, _ := ctx.GetSuperSecureCookie( + base.EncodeMd5(u.Rands+u.Passwd), setting.CookieRememberName); val != u.Name { + ctx.HTML(200, SIGNIN) + return + } + + isSucceed = true + + ctx.Session.Set("uid", u.Id) + ctx.Session.Set("uname", u.Name) + if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { + ctx.SetCookie("redirect_to", "", -1) + ctx.Redirect(redirectTo) + return + } + + ctx.Redirect("/") +} + +func SignInPost(ctx *middleware.Context, form auth.SignInForm) { + ctx.Data["Title"] = ctx.Tr("sign_in") + + // sid, isOauth := ctx.Session.Get("socialId").(int64) + // if isOauth { + // ctx.Data["IsSocialLogin"] = true + // } else if setting.OauthService != nil { + // ctx.Data["OauthEnabled"] = true + // ctx.Data["OauthService"] = setting.OauthService + // } + + if ctx.HasError() { + ctx.HTML(200, SIGNIN) + return + } + + u, err := models.UserSignIn(form.UserName, form.Password) + if err != nil { + if err == models.ErrUserNotExist { + ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &form) + return + } + + ctx.Handle(500, "UserSignIn", err) + return + } + + if form.Remember { + days := 86400 * setting.LogInRememberDays + ctx.SetCookie(setting.CookieUserName, u.Name, days) + ctx.SetSuperSecureCookie(base.EncodeMd5(u.Rands+u.Passwd), + setting.CookieRememberName, u.Name, days) + } + + // Bind with social account. + // if isOauth { + // if err = models.BindUserOauth2(user.Id, sid); err != nil { + // if err == models.ErrOauth2RecordNotExist { + // ctx.Handle(404, "user.SignInPost(GetOauth2ById)", err) + // } else { + // ctx.Handle(500, "user.SignInPost(GetOauth2ById)", err) + // } + // return + // } + // ctx.Session.Delete("socialId") + // log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid) + // } + + ctx.Session.Set("uid", u.Id) + ctx.Session.Set("uname", u.Name) + if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { + ctx.SetCookie("redirect_to", "", -1) + ctx.Redirect(redirectTo) + return + } + + ctx.Redirect("/") +} + +func SignOut(ctx *middleware.Context) { + ctx.Session.Delete("uid") + ctx.Session.Delete("uname") + // ctx.Session.Delete("socialId") + // ctx.Session.Delete("socialName") + // ctx.Session.Delete("socialEmail") + ctx.SetCookie(setting.CookieUserName, "", -1) + ctx.SetCookie(setting.CookieRememberName, "", -1) + ctx.Redirect("/") +} + +func SignUp(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("sign_up") + + if setting.Service.DisableRegistration { + ctx.Data["DisableRegistration"] = true + ctx.HTML(200, SIGNUP) + return + } + + // if sid, ok := ctx.Session.Get("socialId").(int64); ok { + // oauthSignUp(ctx, sid) + // return + // } + + ctx.HTML(200, SIGNUP) +} + +// func oauthSignUp(ctx *middleware.Context, sid int64) { +// ctx.Data["Title"] = "OAuth Sign Up" +// ctx.Data["PageIsSignUp"] = true + +// if _, err := models.GetOauth2ById(sid); err != nil { +// if err == models.ErrOauth2RecordNotExist { +// ctx.Handle(404, "user.oauthSignUp(GetOauth2ById)", err) +// } else { +// ctx.Handle(500, "user.oauthSignUp(GetOauth2ById)", err) +// } +// return +// } + +// ctx.Data["IsSocialLogin"] = true +// ctx.Data["username"] = strings.Replace(ctx.Session.Get("socialName").(string), " ", "", -1) +// ctx.Data["email"] = ctx.Session.Get("socialEmail") +// log.Trace("user.oauthSignUp(social ID): %v", ctx.Session.Get("socialId")) +// ctx.HTML(200, SIGNUP) +// } + +func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.RegisterForm) { + ctx.Data["Title"] = ctx.Tr("sign_up") + + if setting.Service.DisableRegistration { + ctx.Error(403) + return + } + + isOauth := false + // sid, isOauth := ctx.Session.Get("socialId").(int64) + // if isOauth { + // ctx.Data["IsSocialLogin"] = true + // } + + // May redirect from home page. + if ctx.Query("from") == "home" { + // Clear input error box. + ctx.Data["Err_UserName"] = false + ctx.Data["Err_Email"] = false + + // Make the best guess. + uname := ctx.Query("uname") + i := strings.Index(uname, "@") + if i > -1 { + ctx.Data["email"] = uname + ctx.Data["uname"] = uname[:i] + } else { + ctx.Data["uname"] = uname + } + ctx.Data["password"] = ctx.Query("password") + ctx.HTML(200, SIGNUP) + return + } + + if ctx.HasError() { + ctx.HTML(200, SIGNUP) + return + } + + if !cpt.VerifyReq(ctx.Req) { + ctx.Data["Err_Captcha"] = true + ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), SIGNUP, &form) + return + } else if form.Password != form.Retype { + ctx.Data["Err_Password"] = true + ctx.RenderWithErr(ctx.Tr("form.password_not_match"), SIGNUP, &form) + return + } + + u := &models.User{ + Name: form.UserName, + Email: form.Email, + Passwd: form.Password, + IsActive: !setting.Service.RegisterEmailConfirm || isOauth, + } + + if err := models.CreateUser(u); err != nil { + switch err { + case models.ErrUserAlreadyExist: + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SIGNUP, &form) + case models.ErrEmailAlreadyUsed: + ctx.Data["Err_Email"] = true + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SIGNUP, &form) + case models.ErrUserNameIllegal: + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SIGNUP, &form) + default: + ctx.Handle(500, "CreateUser", err) + } + return + } + log.Trace("Account created: %s", u.Name) + + // Bind social account. + // if isOauth { + // if err = models.BindUserOauth2(u.Id, sid); err != nil { + // ctx.Handle(500, "user.SignUp(BindUserOauth2)", err) + // return + // } + // ctx.Session.Delete("socialId") + // log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid) + // } + + // Send confirmation e-mail, no need for social account. + // if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 { + // mailer.SendRegisterMail(ctx.Render, u) + // ctx.Data["IsSendRegisterMail"] = true + // ctx.Data["Email"] = u.Email + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // ctx.HTML(200, "user/activate") + + // if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + // return + // } + + ctx.Redirect("/user/login") +} + +func Activate(ctx *middleware.Context) { + // code := ctx.Query("code") + // if len(code) == 0 { + // ctx.Data["IsActivatePage"] = true + // if ctx.User.IsActive { + // ctx.Handle(404, "user.Activate", nil) + // return + // } + // // Resend confirmation e-mail. + // if setting.Service.RegisterEmailConfirm { + // if ctx.Cache.IsExist("MailResendLimit_" + ctx.User.LowerName) { + // ctx.Data["ResendLimited"] = true + // } else { + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // mailer.SendActiveMail(ctx.Render, ctx.User) + + // if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + // } + // } else { + // ctx.Data["ServiceNotEnabled"] = true + // } + // ctx.HTML(200, ACTIVATE) + // return + // } + + // // Verify code. + // if user := models.VerifyUserActiveCode(code); user != nil { + // user.IsActive = true + // user.Rands = models.GetUserSalt() + // if err := models.UpdateUser(user); err != nil { + // ctx.Handle(404, "user.Activate", err) + // return + // } + + // log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.Name) + + // ctx.Session.Set("userId", user.Id) + // ctx.Session.Set("userName", user.Name) + // ctx.Redirect("/") + // return + // } + + // ctx.Data["IsActivateFailed"] = true + // ctx.HTML(200, ACTIVATE) +} + +func ForgotPasswd(ctx *middleware.Context) { + ctx.Data["Title"] = "Forgot Password" + + if setting.MailService == nil { + ctx.Data["IsResetDisable"] = true + ctx.HTML(200, FORGOT_PASSWORD) + return + } + + ctx.Data["IsResetRequest"] = true + ctx.HTML(200, FORGOT_PASSWORD) +} + +func ForgotPasswdPost(ctx *middleware.Context) { + // ctx.Data["Title"] = "Forgot Password" + + // if setting.MailService == nil { + // ctx.Handle(403, "user.ForgotPasswdPost", nil) + // return + // } + // ctx.Data["IsResetRequest"] = true + + // email := ctx.Query("email") + // u, err := models.GetUserByEmail(email) + // if err != nil { + // if err == models.ErrUserNotExist { + // ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil) + // } else { + // ctx.Handle(500, "user.ResetPasswd(check existence)", err) + // } + // return + // } + + // if ctx.Cache.IsExist("MailResendLimit_" + u.LowerName) { + // ctx.Data["ResendLimited"] = true + // ctx.HTML(200, FORGOT_PASSWORD) + // return + // } + + // mailer.SendResetPasswdMail(ctx.Render, u) + // if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + + // ctx.Data["Email"] = email + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // ctx.Data["IsResetSent"] = true + // ctx.HTML(200, FORGOT_PASSWORD) +} + +func ResetPasswd(ctx *middleware.Context) { + ctx.Data["Title"] = "Reset Password" + + code := ctx.Query("code") + if len(code) == 0 { + ctx.Error(404) + return + } + ctx.Data["Code"] = code + ctx.Data["IsResetForm"] = true + ctx.HTML(200, RESET_PASSWORD) +} + +func ResetPasswdPost(ctx *middleware.Context) { + // ctx.Data["Title"] = "Reset Password" + + // code := ctx.Query("code") + // if len(code) == 0 { + // ctx.Error(404) + // return + // } + // ctx.Data["Code"] = code + + // if u := models.VerifyUserActiveCode(code); u != nil { + // // Validate password length. + // passwd := ctx.Query("passwd") + // if len(passwd) < 6 || len(passwd) > 30 { + // ctx.Data["IsResetForm"] = true + // ctx.RenderWithErr("Password length should be in 6 and 30.", "user/reset_passwd", nil) + // return + // } + + // u.Passwd = passwd + // u.Rands = models.GetUserSalt() + // u.Salt = models.GetUserSalt() + // u.EncodePasswd() + // if err := models.UpdateUser(u); err != nil { + // ctx.Handle(500, "user.ResetPasswd(UpdateUser)", err) + // return + // } + + // log.Trace("%s User password reset: %s", ctx.Req.RequestURI, u.Name) + // ctx.Redirect("/user/login") + // return + // } + + // ctx.Data["IsResetFailed"] = true + // ctx.HTML(200, RESET_PASSWORD) +} diff --git a/routers/user/home.go b/routers/user/home.go index 02dc1de154..b5a789ae0e 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -8,26 +8,25 @@ import ( "fmt" "github.com/Unknwon/com" - "github.com/go-martini/martini" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" ) const ( - DASHBOARD base.TplName = "user/dashboard" - PROFILE base.TplName = "user/profile" + DASHBOARD base.TplName = "user/dashboard/dashboard" ISSUES base.TplName = "user/issues" PULLS base.TplName = "user/pulls" STARS base.TplName = "user/stars" + PROFILE base.TplName = "user/profile" ) func Dashboard(ctx *middleware.Context) { - ctx.Data["Title"] = "Dashboard" - ctx.Data["PageIsUserDashboard"] = true + ctx.Data["Title"] = ctx.Tr("dashboard") + ctx.Data["PageIsDashboard"] = true + ctx.Data["PageIsNews"] = true if err := ctx.User.GetOrganizations(); err != nil { ctx.Handle(500, "home.Dashboard(GetOrganizations)", err) @@ -36,22 +35,25 @@ func Dashboard(ctx *middleware.Context) { ctx.Data["Orgs"] = ctx.User.Orgs ctx.Data["ContextUser"] = ctx.User - var err error - ctx.Data["MyRepos"], err = models.GetRepositories(ctx.User.Id, true) + repos, err := models.GetRepositories(ctx.User.Id, true) if err != nil { - ctx.Handle(500, "home.Dashboard(GetRepositories)", err) + ctx.Handle(500, "GetRepositories", err) return } + for _, repo := range repos { + repo.Owner = ctx.User + } + ctx.Data["Repos"] = repos ctx.Data["CollaborativeRepos"], err = models.GetCollaborativeRepos(ctx.User.Name) if err != nil { - ctx.Handle(500, "home.Dashboard(GetCollaborativeRepos)", err) + ctx.Handle(500, "GetCollaborativeRepos", err) return } - actions, err := models.GetFeeds(ctx.User.Id, 0, false) + actions, err := models.GetFeeds(ctx.User.Id, 0, true) if err != nil { - ctx.Handle(500, "home.Dashboard(GetFeeds)", err) + ctx.Handle(500, "GetFeeds", err) return } @@ -70,11 +72,11 @@ func Dashboard(ctx *middleware.Context) { ctx.HTML(200, DASHBOARD) } -func Profile(ctx *middleware.Context, params martini.Params) { +func Profile(ctx *middleware.Context) { ctx.Data["Title"] = "Profile" ctx.Data["PageIsUserProfile"] = true - u, err := models.GetUserByName(params["username"]) + u, err := models.GetUserByName(ctx.Params(":username")) if err != nil { if err == models.ErrUserNotExist { ctx.Handle(404, "user.Profile(GetUserByName)", err) @@ -133,26 +135,26 @@ const (
%s`
)
-func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
- actions, err := models.GetFeeds(form.UserId, form.Page*20, false)
- if err != nil {
- ctx.JSON(500, err)
- return
- }
+// func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
+// actions, err := models.GetFeeds(form.UserId, form.Page*20, false)
+// if err != nil {
+// ctx.JSON(500, err)
+// return
+// }
- feeds := make([]string, 0, len(actions))
- for _, act := range actions {
- if act.IsPrivate {
- if has, _ := models.HasAccess(ctx.User.Name, act.RepoUserName+"/"+act.RepoName,
- models.READABLE); !has {
- continue
- }
- }
- feeds = append(feeds, fmt.Sprintf(TPL_FEED, base.ActionIcon(act.OpType),
- base.TimeSince(act.Created), base.ActionDesc(act)))
- }
- ctx.JSON(200, &feeds)
-}
+// feeds := make([]string, 0, len(actions))
+// for _, act := range actions {
+// if act.IsPrivate {
+// if has, _ := models.HasAccess(ctx.User.Name, act.RepoUserName+"/"+act.RepoName,
+// models.READABLE); !has {
+// continue
+// }
+// }
+// feeds = append(feeds, fmt.Sprintf(TPL_FEED, base.ActionIcon(act.OpType),
+// base.TimeSince(act.Created), base.ActionDesc(act)))
+// }
+// ctx.JSON(200, &feeds)
+// }
func Issues(ctx *middleware.Context) {
ctx.Data["Title"] = "Your Issues"
@@ -173,7 +175,7 @@ func Issues(ctx *middleware.Context) {
filterMode = models.FM_CREATE
}
- repoId, _ := base.StrTo(ctx.Query("repoid")).Int64()
+ repoId, _ := com.StrTo(ctx.Query("repoid")).Int64()
issueStats := models.GetUserIssueStats(ctx.User.Id, filterMode)
// Get all repositories.
@@ -215,7 +217,7 @@ func Issues(ctx *middleware.Context) {
repoIds = []int64{repoId}
}
- page, _ := base.StrTo(ctx.Query("page")).Int()
+ page, _ := com.StrTo(ctx.Query("page")).Int()
// Get all issues.
var ius []*models.IssueUser
diff --git a/routers/user/setting.go b/routers/user/setting.go
index c38b4cb577..761052144f 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -5,76 +5,63 @@
package user
import (
- "errors"
- "fmt"
- "io/ioutil"
- "os"
- "strconv"
- "strings"
+ "github.com/Unknwon/com"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
- "github.com/gogits/gogs/modules/process"
)
const (
- SETTING base.TplName = "user/setting"
- SOCIAL base.TplName = "user/social"
- PASSWORD base.TplName = "user/password"
- PUBLICKEY base.TplName = "user/publickey"
- NOTIFICATION base.TplName = "user/notification"
- SECURITY base.TplName = "user/security"
+ SETTINGS_PROFILE base.TplName = "user/settings/profile"
+ SETTINGS_PASSWORD base.TplName = "user/settings/password"
+ SETTINGS_SSH_KEYS base.TplName = "user/settings/sshkeys"
+ SETTINGS_SOCIAL base.TplName = "user/settings/social"
+ SETTINGS_ORGS base.TplName = "user/settings/orgs"
+ SETTINGS_DELETE base.TplName = "user/settings/delete"
+ NOTIFICATION base.TplName = "user/notification"
+ SECURITY base.TplName = "user/security"
)
-var (
- MinimumKeySize = map[string]int{
- "(ED25519)": 256,
- "(ECDSA)": 256,
- "(NTRU)": 1087,
- "(MCE)": 1702,
- "(McE)": 1702,
- "(RSA)": 2048,
- }
-)
-
-func Setting(ctx *middleware.Context) {
- ctx.Data["Title"] = "Setting"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSetting"] = true
- ctx.Data["Owner"] = ctx.User
- ctx.HTML(200, SETTING)
+func Settings(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsProfile"] = true
+ ctx.HTML(200, SETTINGS_PROFILE)
}
-func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
- ctx.Data["Title"] = "Setting"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSetting"] = true
+func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsProfile"] = true
if ctx.HasError() {
- ctx.HTML(200, SETTING)
+ ctx.HTML(200, SETTINGS_PROFILE)
return
}
- ctx.Data["Owner"] = ctx.User
-
// Check if user name has been changed.
if ctx.User.Name != form.UserName {
isExist, err := models.IsUserExist(form.UserName)
if err != nil {
- ctx.Handle(500, "user.SettingPost(update: check existence)", err)
+ ctx.Handle(500, "IsUserExist", err)
return
} else if isExist {
- ctx.RenderWithErr("User name has been taken.", SETTING, &form)
+ ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SETTINGS_PROFILE, &form)
return
} else if err = models.ChangeUserName(ctx.User, form.UserName); err != nil {
- ctx.Handle(500, "user.SettingPost(change user name)", err)
+ if err == models.ErrUserNameIllegal {
+ ctx.Flash.Error(ctx.Tr("form.illegal_username"))
+ ctx.Redirect("/user/settings")
+ return
+ } else {
+ ctx.Handle(500, "ChangeUserName", err)
+ }
return
}
- log.Trace("%s User name changed: %s -> %s", ctx.Req.RequestURI, ctx.User.Name, form.UserName)
-
+ log.Trace("User name changed: %s -> %s", ctx.User.Name, form.UserName)
ctx.User.Name = form.UserName
}
@@ -85,213 +72,204 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
ctx.User.Avatar = base.EncodeMd5(form.Avatar)
ctx.User.AvatarEmail = form.Avatar
if err := models.UpdateUser(ctx.User); err != nil {
- ctx.Handle(500, "setting.SettingPost(UpdateUser)", err)
+ ctx.Handle(500, "UpdateUser", err)
return
}
- log.Trace("%s User setting updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
- ctx.Flash.Success("Your profile has been successfully updated.")
+ log.Trace("User setting updated: %s", ctx.User.Name)
+ ctx.Flash.Success(ctx.Tr("settings.update_profile_success"))
ctx.Redirect("/user/settings")
}
-func SettingSocial(ctx *middleware.Context) {
- ctx.Data["Title"] = "Social Account"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingSocial"] = true
-
- // Unbind social account.
- remove, _ := base.StrTo(ctx.Query("remove")).Int64()
- if remove > 0 {
- if err := models.DeleteOauth2ById(remove); err != nil {
- ctx.Handle(500, "user.SettingSocial(DeleteOauth2ById)", err)
- return
- }
- ctx.Flash.Success("OAuth2 has been unbinded.")
- ctx.Redirect("/user/settings/social")
- return
- }
-
- var err error
- ctx.Data["Socials"], err = models.GetOauthByUserId(ctx.User.Id)
- if err != nil {
- ctx.Handle(500, "user.SettingSocial(GetOauthByUserId)", err)
- return
- }
- ctx.HTML(200, SOCIAL)
+func SettingsPassword(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsPassword"] = true
+ ctx.HTML(200, SETTINGS_PASSWORD)
}
-func SettingPassword(ctx *middleware.Context) {
- ctx.Data["Title"] = "Password"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingPasswd"] = true
- ctx.HTML(200, PASSWORD)
-}
-
-func SettingPasswordPost(ctx *middleware.Context, form auth.UpdatePasswdForm) {
- ctx.Data["Title"] = "Password"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingPasswd"] = true
+func SettingsPasswordPost(ctx *middleware.Context, form auth.ChangePasswordForm) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsPassword"] = true
if ctx.HasError() {
- ctx.HTML(200, PASSWORD)
+ ctx.HTML(200, SETTINGS_PASSWORD)
return
}
tmpUser := &models.User{
- Passwd: form.OldPasswd,
+ Passwd: form.OldPassword,
Salt: ctx.User.Salt,
}
tmpUser.EncodePasswd()
if ctx.User.Passwd != tmpUser.Passwd {
- ctx.Flash.Error("Old password is not correct.")
- } else if form.NewPasswd != form.RetypePasswd {
- ctx.Flash.Error("New password and re-type password are not same.")
+ ctx.Flash.Error(ctx.Tr("settings.password_incorrect"))
+ } else if form.Password != form.Retype {
+ ctx.Flash.Error(ctx.Tr("form.password_not_match"))
} else {
- ctx.User.Passwd = form.NewPasswd
+ ctx.User.Passwd = form.Password
ctx.User.Salt = models.GetUserSalt()
ctx.User.EncodePasswd()
if err := models.UpdateUser(ctx.User); err != nil {
- ctx.Handle(200, "setting.SettingPassword", err)
+ ctx.Handle(500, "UpdateUser", err)
return
}
- log.Trace("%s User password updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
- ctx.Flash.Success("Password is changed successfully. You can now sign in via new password.")
+ log.Trace("User password updated: %s", ctx.User.Name)
+ ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
}
+
ctx.Redirect("/user/settings/password")
}
-// Checks if the given public key string is recognized by SSH.
-func CheckPublicKeyString(keyContent string) (ok bool, err error) {
- if strings.ContainsAny(keyContent, "\n\r") {
- return false, errors.New("Only a single line with a single key please")
- }
-
- // write the key to a file…
- tmpFile, err := ioutil.TempFile(os.TempDir(), "keytest")
- if err != nil {
- return false, err
- }
- tmpPath := tmpFile.Name()
- defer os.Remove(tmpPath)
- tmpFile.WriteString(keyContent)
- tmpFile.Close()
-
- // … see if ssh-keygen recognizes its contents
- stdout, stderr, err := process.Exec("CheckPublicKeyString", "ssh-keygen", "-l", "-f", tmpPath)
- if err != nil {
- return false, errors.New("ssh-keygen -l -f: " + stderr)
- } else if len(stdout) < 2 {
- return false, errors.New("ssh-keygen returned not enough output to evaluate the key")
- }
- sshKeygenOutput := strings.Split(stdout, " ")
- if len(sshKeygenOutput) < 4 {
- return false, errors.New("Not enough fields returned by ssh-keygen -l -f")
- }
- keySize, err := strconv.Atoi(sshKeygenOutput[0])
- if err != nil {
- return false, errors.New("Cannot get key size of the given key")
- }
- keyType := strings.TrimSpace(sshKeygenOutput[len(sshKeygenOutput)-1])
-
- if minimumKeySize := MinimumKeySize[keyType]; minimumKeySize == 0 {
- return false, errors.New("Sorry, unrecognized public key type")
- } else {
- if keySize < minimumKeySize {
- return false, fmt.Errorf("The minimum accepted size of a public key %s is %d", keyType, minimumKeySize)
- }
- }
-
- return true, nil
-}
-
-func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
- ctx.Data["Title"] = "SSH Keys"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingSSH"] = true
-
- // Delete SSH key.
- if ctx.Req.Method == "DELETE" || ctx.Query("_method") == "DELETE" {
- id, err := base.StrTo(ctx.Query("id")).Int64()
- if err != nil {
- log.Error("ssh.DelPublicKey: %v", err)
- ctx.JSON(200, map[string]interface{}{
- "ok": false,
- "err": err.Error(),
- })
- return
- }
-
- if err = models.DeletePublicKey(&models.PublicKey{Id: id}); err != nil {
- log.Error("ssh.DelPublicKey: %v", err)
- ctx.JSON(200, map[string]interface{}{
- "ok": false,
- "err": err.Error(),
- })
- } else {
- log.Trace("%s User SSH key deleted: %s", ctx.Req.RequestURI, ctx.User.LowerName)
- ctx.JSON(200, map[string]interface{}{
- "ok": true,
- })
- }
- return
- }
+func SettingsSSHKeys(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsSSHKeys"] = true
var err error
- // List existed SSH keys.
ctx.Data["Keys"], err = models.ListPublicKey(ctx.User.Id)
if err != nil {
ctx.Handle(500, "ssh.ListPublicKey", err)
return
}
- // Add new SSH key.
- if ctx.Req.Method == "POST" {
- if ctx.HasError() {
- ctx.HTML(200, "user/publickey")
+ ctx.HTML(200, SETTINGS_SSH_KEYS)
+}
+
+func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsSSHKeys"] = true
+
+ var err error
+ ctx.Data["Keys"], err = models.ListPublicKey(ctx.User.Id)
+ if err != nil {
+ ctx.Handle(500, "ssh.ListPublicKey", err)
+ return
+ }
+
+ // Delete SSH key.
+ if ctx.Query("_method") == "DELETE" {
+ id := com.StrTo(ctx.Query("id")).MustInt64()
+ if id <= 0 {
return
}
- if ok, err := CheckPublicKeyString(form.KeyContent); !ok {
- ctx.Flash.Error(err.Error())
+ if err = models.DeletePublicKey(&models.PublicKey{Id: id}); err != nil {
+ ctx.Handle(500, "DeletePublicKey", err)
+ } else {
+ log.Trace("SSH key deleted: %s", ctx.User.Name)
+ ctx.Redirect("/user/settings/ssh")
+ }
+ return
+ }
+
+ // Add new SSH key.
+ if ctx.Req.Method == "POST" {
+ if ctx.HasError() {
+ ctx.HTML(200, SETTINGS_SSH_KEYS)
+ return
+ }
+
+ if ok, err := models.CheckPublicKeyString(form.Content); !ok {
+ ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error()))
ctx.Redirect("/user/settings/ssh")
return
}
k := &models.PublicKey{
OwnerId: ctx.User.Id,
- Name: form.KeyName,
- Content: form.KeyContent,
+ Name: form.SSHTitle,
+ Content: form.Content,
}
-
if err := models.AddPublicKey(k); err != nil {
- if err.Error() == models.ErrKeyAlreadyExist.Error() {
- ctx.RenderWithErr("Public key name has been used", "user/publickey", &form)
+ if err == models.ErrKeyAlreadyExist {
+ ctx.RenderWithErr(ctx.Tr("form.ssh_key_been_used"), SETTINGS_SSH_KEYS, &form)
return
}
ctx.Handle(500, "ssh.AddPublicKey", err)
return
} else {
- log.Trace("%s User SSH key added: %s", ctx.Req.RequestURI, ctx.User.LowerName)
- ctx.Flash.Success("New SSH Key has been added!")
+ log.Trace("SSH key added: %s", ctx.User.Name)
+ ctx.Flash.Success(ctx.Tr("settings.add_key_success"))
ctx.Redirect("/user/settings/ssh")
return
}
}
- ctx.HTML(200, PUBLICKEY)
+ ctx.HTML(200, SETTINGS_SSH_KEYS)
}
-func SettingNotification(ctx *middleware.Context) {
- // TODO: user setting notification
- ctx.Data["Title"] = "Notification"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingNotify"] = true
- ctx.HTML(200, NOTIFICATION)
+// func SettingSocial(ctx *middleware.Context) {
+// ctx.Data["Title"] = "Social Account"
+// ctx.Data["PageIsUserSetting"] = true
+// ctx.Data["IsUserPageSettingSocial"] = true
+
+// // Unbind social account.
+// remove, _ := base.StrTo(ctx.Query("remove")).Int64()
+// if remove > 0 {
+// if err := models.DeleteOauth2ById(remove); err != nil {
+// ctx.Handle(500, "user.SettingSocial(DeleteOauth2ById)", err)
+// return
+// }
+// ctx.Flash.Success("OAuth2 has been unbinded.")
+// ctx.Redirect("/user/settings/social")
+// return
+// }
+
+// var err error
+// ctx.Data["Socials"], err = models.GetOauthByUserId(ctx.User.Id)
+// if err != nil {
+// ctx.Handle(500, "user.SettingSocial(GetOauthByUserId)", err)
+// return
+// }
+// ctx.HTML(200, SOCIAL)
+// }
+
+func SettingsSocial(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsSocial"] = true
+ ctx.HTML(200, SETTINGS_SOCIAL)
}
-func SettingSecurity(ctx *middleware.Context) {
- // TODO: user setting security
- ctx.Data["Title"] = "Security"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingSecurity"] = true
- ctx.HTML(200, SECURITY)
+func SettingsOrgs(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsOrgs"] = true
+ ctx.HTML(200, SETTINGS_ORGS)
+}
+
+func SettingsDelete(ctx *middleware.Context) {
+ ctx.Data["Title"] = ctx.Tr("settings")
+ ctx.Data["PageIsUserSettings"] = true
+ ctx.Data["PageIsSettingsDelete"] = true
+
+ if ctx.Req.Method == "POST" {
+ // tmpUser := models.User{
+ // Passwd: ctx.Query("password"),
+ // Salt: ctx.User.Salt,
+ // }
+ // tmpUser.EncodePasswd()
+ // if tmpUser.Passwd != ctx.User.Passwd {
+ // ctx.Flash.Error("Password is not correct. Make sure you are owner of this account.")
+ // } else {
+ if err := models.DeleteUser(ctx.User); err != nil {
+ switch err {
+ case models.ErrUserOwnRepos:
+ ctx.Flash.Error(ctx.Tr("form.still_own_repo"))
+ ctx.Redirect("/user/settings/delete")
+ return
+ default:
+ ctx.Handle(500, "DeleteUser", err)
+ return
+ }
+ } else {
+ log.Trace("Account deleted: %s", ctx.User.Name)
+ ctx.Redirect("/")
+ return
+ }
+ }
+
+ ctx.HTML(200, SETTINGS_DELETE)
}
diff --git a/routers/user/social.go b/routers/user/social.go
index 9a56415fd4..ef83cd5b42 100644
--- a/routers/user/social.go
+++ b/routers/user/social.go
@@ -11,8 +11,6 @@ import (
"net/url"
"strings"
- "github.com/go-martini/martini"
-
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
@@ -28,14 +26,14 @@ func extractPath(next string) string {
return n.Path
}
-func SocialSignIn(ctx *middleware.Context, params martini.Params) {
+func SocialSignIn(ctx *middleware.Context) {
if setting.OauthService == nil {
ctx.Handle(404, "social.SocialSignIn(oauth service not enabled)", nil)
return
}
next := extractPath(ctx.Query("next"))
- name := params["name"]
+ name := ctx.Params(":name")
connect, ok := social.SocialMap[name]
if !ok {
ctx.Handle(404, "social.SocialSignIn(social login not enabled)", errors.New(name))
@@ -81,7 +79,7 @@ func SocialSignIn(ctx *middleware.Context, params martini.Params) {
}
log.Trace("social.SocialSignIn(oa): %v", oa)
if err = models.AddOauth2(oa); err != nil {
- log.Error("social.SocialSignIn(add oauth2): %v", err) // 501
+ log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501
return
}
case models.ErrOauth2NotAssociated:
diff --git a/routers/user/user.go b/routers/user/user.go
deleted file mode 100644
index 561fe1c111..0000000000
--- a/routers/user/user.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package user
-
-import (
- "net/url"
- "strings"
-
- "github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/auth"
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/log"
- "github.com/gogits/gogs/modules/mailer"
- "github.com/gogits/gogs/modules/middleware"
- "github.com/gogits/gogs/modules/setting"
-)
-
-const (
- SIGNIN base.TplName = "user/signin"
- SIGNUP base.TplName = "user/signup"
- DELETE base.TplName = "user/delete"
- ACTIVATE base.TplName = "user/activate"
- FORGOT_PASSWORD base.TplName = "user/forgot_passwd"
- RESET_PASSWORD base.TplName = "user/reset_passwd"
-)
-
-func SignIn(ctx *middleware.Context) {
- ctx.Data["Title"] = "Log In"
-
- if _, ok := ctx.Session.Get("socialId").(int64); ok {
- ctx.Data["IsSocialLogin"] = true
- ctx.HTML(200, SIGNIN)
- return
- }
-
- if setting.OauthService != nil {
- ctx.Data["OauthEnabled"] = true
- ctx.Data["OauthService"] = setting.OauthService
- }
-
- // Check auto-login.
- uname := ctx.GetCookie(setting.CookieUserName)
- if len(uname) == 0 {
- ctx.HTML(200, SIGNIN)
- return
- }
-
- isSucceed := false
- defer func() {
- if !isSucceed {
- log.Trace("user.SignIn(auto-login cookie cleared): %s", uname)
- ctx.SetCookie(setting.CookieUserName, "", -1)
- ctx.SetCookie(setting.CookieRememberName, "", -1)
- return
- }
- }()
-
- user, err := models.GetUserByName(uname)
- if err != nil {
- ctx.Handle(500, "user.SignIn(GetUserByName)", err)
- return
- }
-
- secret := base.EncodeMd5(user.Rands + user.Passwd)
- value, _ := ctx.GetSecureCookie(secret, setting.CookieRememberName)
- if value != user.Name {
- ctx.HTML(200, SIGNIN)
- return
- }
-
- isSucceed = true
-
- ctx.Session.Set("userId", user.Id)
- ctx.Session.Set("userName", user.Name)
- if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
- ctx.SetCookie("redirect_to", "", -1)
- ctx.Redirect(redirectTo)
- return
- }
-
- ctx.Redirect("/")
-}
-
-func SignInPost(ctx *middleware.Context, form auth.LogInForm) {
- ctx.Data["Title"] = "Log In"
-
- sid, isOauth := ctx.Session.Get("socialId").(int64)
- if isOauth {
- ctx.Data["IsSocialLogin"] = true
- } else if setting.OauthService != nil {
- ctx.Data["OauthEnabled"] = true
- ctx.Data["OauthService"] = setting.OauthService
- }
-
- if ctx.HasError() {
- ctx.HTML(200, SIGNIN)
- return
- }
-
- user, err := models.UserSignIn(form.UserName, form.Password)
- if err != nil {
- if err == models.ErrUserNotExist {
- log.Trace("%s Log in failed: %s", ctx.Req.RequestURI, form.UserName)
- ctx.RenderWithErr("Username or password is not correct", SIGNIN, &form)
- return
- }
-
- ctx.Handle(500, "user.SignInPost(UserSignIn)", err)
- return
- }
-
- if form.Remember {
- secret := base.EncodeMd5(user.Rands + user.Passwd)
- days := 86400 * setting.LogInRememberDays
- ctx.SetCookie(setting.CookieUserName, user.Name, days)
- ctx.SetSecureCookie(secret, setting.CookieRememberName, user.Name, days)
- }
-
- // Bind with social account.
- if isOauth {
- if err = models.BindUserOauth2(user.Id, sid); err != nil {
- if err == models.ErrOauth2RecordNotExist {
- ctx.Handle(404, "user.SignInPost(GetOauth2ById)", err)
- } else {
- ctx.Handle(500, "user.SignInPost(GetOauth2ById)", err)
- }
- return
- }
- ctx.Session.Delete("socialId")
- log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid)
- }
-
- ctx.Session.Set("userId", user.Id)
- ctx.Session.Set("userName", user.Name)
- if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
- ctx.SetCookie("redirect_to", "", -1)
- ctx.Redirect(redirectTo)
- return
- }
-
- ctx.Redirect("/")
-}
-
-func SignOut(ctx *middleware.Context) {
- ctx.Session.Delete("userId")
- ctx.Session.Delete("userName")
- ctx.Session.Delete("socialId")
- ctx.Session.Delete("socialName")
- ctx.Session.Delete("socialEmail")
- ctx.SetCookie(setting.CookieUserName, "", -1)
- ctx.SetCookie(setting.CookieRememberName, "", -1)
- ctx.Redirect("/")
-}
-
-func SignUp(ctx *middleware.Context) {
- ctx.Data["Title"] = "Sign Up"
- ctx.Data["PageIsSignUp"] = true
-
- if setting.Service.DisableRegistration {
- ctx.Data["DisableRegistration"] = true
- ctx.HTML(200, SIGNUP)
- return
- }
-
- if sid, ok := ctx.Session.Get("socialId").(int64); ok {
- oauthSignUp(ctx, sid)
- return
- }
-
- ctx.HTML(200, SIGNUP)
-}
-
-func oauthSignUp(ctx *middleware.Context, sid int64) {
- ctx.Data["Title"] = "OAuth Sign Up"
- ctx.Data["PageIsSignUp"] = true
-
- if _, err := models.GetOauth2ById(sid); err != nil {
- if err == models.ErrOauth2RecordNotExist {
- ctx.Handle(404, "user.oauthSignUp(GetOauth2ById)", err)
- } else {
- ctx.Handle(500, "user.oauthSignUp(GetOauth2ById)", err)
- }
- return
- }
-
- ctx.Data["IsSocialLogin"] = true
- ctx.Data["username"] = strings.Replace(ctx.Session.Get("socialName").(string), " ", "", -1)
- ctx.Data["email"] = ctx.Session.Get("socialEmail")
- log.Trace("user.oauthSignUp(social ID): %v", ctx.Session.Get("socialId"))
- ctx.HTML(200, SIGNUP)
-}
-
-func SignUpPost(ctx *middleware.Context, form auth.RegisterForm) {
- ctx.Data["Title"] = "Sign Up"
- ctx.Data["PageIsSignUp"] = true
-
- if setting.Service.DisableRegistration {
- ctx.Handle(403, "user.SignUpPost", nil)
- return
- }
-
- sid, isOauth := ctx.Session.Get("socialId").(int64)
- if isOauth {
- ctx.Data["IsSocialLogin"] = true
- }
-
- if ctx.HasError() {
- ctx.HTML(200, SIGNUP)
- return
- }
-
- if form.Password != form.RetypePasswd {
- ctx.Data["Err_Password"] = true
- ctx.Data["Err_RetypePasswd"] = true
- ctx.RenderWithErr("Password and re-type password are not same.", SIGNUP, &form)
- return
- }
-
- u := &models.User{
- Name: form.UserName,
- Email: form.Email,
- Passwd: form.Password,
- IsActive: !setting.Service.RegisterEmailConfirm || isOauth,
- }
-
- var err error
- if u, err = models.CreateUser(u); err != nil {
- switch err {
- case models.ErrUserAlreadyExist:
- ctx.Data["Err_UserName"] = true
- ctx.RenderWithErr("Username has been already taken", SIGNUP, &form)
- case models.ErrEmailAlreadyUsed:
- ctx.Data["Err_Email"] = true
- ctx.RenderWithErr("E-mail address has been already used", SIGNUP, &form)
- case models.ErrUserNameIllegal:
- ctx.Data["Err_UserName"] = true
- ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), SIGNUP, &form)
- default:
- ctx.Handle(500, "user.SignUpPost(CreateUser)", err)
- }
- return
- }
- log.Trace("%s User created: %s", ctx.Req.RequestURI, u.Name)
-
- // Bind social account.
- if isOauth {
- if err = models.BindUserOauth2(u.Id, sid); err != nil {
- ctx.Handle(500, "user.SignUp(BindUserOauth2)", err)
- return
- }
- ctx.Session.Delete("socialId")
- log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid)
- }
-
- // Send confirmation e-mail, no need for social account.
- if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 {
- mailer.SendRegisterMail(ctx.Render, u)
- ctx.Data["IsSendRegisterMail"] = true
- ctx.Data["Email"] = u.Email
- ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
- ctx.HTML(200, "user/activate")
-
- if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil {
- log.Error("Set cache(MailResendLimit) fail: %v", err)
- }
- return
- }
-
- ctx.Redirect("/user/login")
-}
-
-func Delete(ctx *middleware.Context) {
- ctx.Data["Title"] = "Delete Account"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingDelete"] = true
- ctx.HTML(200, DELETE)
-}
-
-func DeletePost(ctx *middleware.Context) {
- ctx.Data["Title"] = "Delete Account"
- ctx.Data["PageIsUserSetting"] = true
- ctx.Data["IsUserPageSettingDelete"] = true
-
- tmpUser := models.User{
- Passwd: ctx.Query("password"),
- Salt: ctx.User.Salt,
- }
- tmpUser.EncodePasswd()
- if tmpUser.Passwd != ctx.User.Passwd {
- ctx.Flash.Error("Password is not correct. Make sure you are owner of this account.")
- } else {
- if err := models.DeleteUser(ctx.User); err != nil {
- switch err {
- case models.ErrUserOwnRepos:
- ctx.Flash.Error("Your account still have ownership of repository, you have to delete or transfer them first.")
- default:
- ctx.Handle(500, "user.DeletePost(DeleteUser)", err)
- return
- }
- } else {
- ctx.Redirect("/")
- return
- }
- }
-
- ctx.Redirect("/user/delete")
-}
-
-func Activate(ctx *middleware.Context) {
- code := ctx.Query("code")
- if len(code) == 0 {
- ctx.Data["IsActivatePage"] = true
- if ctx.User.IsActive {
- ctx.Handle(404, "user.Activate", nil)
- return
- }
- // Resend confirmation e-mail.
- if setting.Service.RegisterEmailConfirm {
- if ctx.Cache.IsExist("MailResendLimit_" + ctx.User.LowerName) {
- ctx.Data["ResendLimited"] = true
- } else {
- ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
- mailer.SendActiveMail(ctx.Render, ctx.User)
-
- if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
- log.Error("Set cache(MailResendLimit) fail: %v", err)
- }
- }
- } else {
- ctx.Data["ServiceNotEnabled"] = true
- }
- ctx.HTML(200, ACTIVATE)
- return
- }
-
- // Verify code.
- if user := models.VerifyUserActiveCode(code); user != nil {
- user.IsActive = true
- user.Rands = models.GetUserSalt()
- if err := models.UpdateUser(user); err != nil {
- ctx.Handle(404, "user.Activate", err)
- return
- }
-
- log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.Name)
-
- ctx.Session.Set("userId", user.Id)
- ctx.Session.Set("userName", user.Name)
- ctx.Redirect("/")
- return
- }
-
- ctx.Data["IsActivateFailed"] = true
- ctx.HTML(200, ACTIVATE)
-}
-
-func ForgotPasswd(ctx *middleware.Context) {
- ctx.Data["Title"] = "Forgot Password"
-
- if setting.MailService == nil {
- ctx.Data["IsResetDisable"] = true
- ctx.HTML(200, FORGOT_PASSWORD)
- return
- }
-
- ctx.Data["IsResetRequest"] = true
- ctx.HTML(200, FORGOT_PASSWORD)
-}
-
-func ForgotPasswdPost(ctx *middleware.Context) {
- ctx.Data["Title"] = "Forgot Password"
-
- if setting.MailService == nil {
- ctx.Handle(403, "user.ForgotPasswdPost", nil)
- return
- }
- ctx.Data["IsResetRequest"] = true
-
- email := ctx.Query("email")
- u, err := models.GetUserByEmail(email)
- if err != nil {
- if err == models.ErrUserNotExist {
- ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil)
- } else {
- ctx.Handle(500, "user.ResetPasswd(check existence)", err)
- }
- return
- }
-
- if ctx.Cache.IsExist("MailResendLimit_" + u.LowerName) {
- ctx.Data["ResendLimited"] = true
- ctx.HTML(200, FORGOT_PASSWORD)
- return
- }
-
- mailer.SendResetPasswdMail(ctx.Render, u)
- if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil {
- log.Error("Set cache(MailResendLimit) fail: %v", err)
- }
-
- ctx.Data["Email"] = email
- ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
- ctx.Data["IsResetSent"] = true
- ctx.HTML(200, FORGOT_PASSWORD)
-}
-
-func ResetPasswd(ctx *middleware.Context) {
- ctx.Data["Title"] = "Reset Password"
-
- code := ctx.Query("code")
- if len(code) == 0 {
- ctx.Error(404)
- return
- }
- ctx.Data["Code"] = code
- ctx.Data["IsResetForm"] = true
- ctx.HTML(200, RESET_PASSWORD)
-}
-
-func ResetPasswdPost(ctx *middleware.Context) {
- ctx.Data["Title"] = "Reset Password"
-
- code := ctx.Query("code")
- if len(code) == 0 {
- ctx.Error(404)
- return
- }
- ctx.Data["Code"] = code
-
- if u := models.VerifyUserActiveCode(code); u != nil {
- // Validate password length.
- passwd := ctx.Query("passwd")
- if len(passwd) < 6 || len(passwd) > 30 {
- ctx.Data["IsResetForm"] = true
- ctx.RenderWithErr("Password length should be in 6 and 30.", "user/reset_passwd", nil)
- return
- }
-
- u.Passwd = passwd
- u.Rands = models.GetUserSalt()
- u.Salt = models.GetUserSalt()
- u.EncodePasswd()
- if err := models.UpdateUser(u); err != nil {
- ctx.Handle(500, "user.ResetPasswd(UpdateUser)", err)
- return
- }
-
- log.Trace("%s User password reset: %s", ctx.Req.RequestURI, u.Name)
- ctx.Redirect("/user/login")
- return
- }
-
- ctx.Data["IsResetFailed"] = true
- ctx.HTML(200, RESET_PASSWORD)
-}
diff --git a/rpp.ini b/rpp.ini
deleted file mode 100644
index 50d1e0c753..0000000000
--- a/rpp.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[host]
-LISTEN_ADDR = 127.0.0.1:5000
-REMOTE_ADDR = 127.0.0.1:5000
-
-[rules]
-IGNORES = .git|.DS_Store|*.tmp|data
\ No newline at end of file
diff --git a/build.sh b/scripts/build.sh
similarity index 100%
rename from build.sh
rename to scripts/build.sh
diff --git a/build_linux64.sh b/scripts/build_linux64.sh
similarity index 100%
rename from build_linux64.sh
rename to scripts/build_linux64.sh
diff --git a/scripts/dockerfiles/README.md b/scripts/dockerfiles/README.md
new file mode 100644
index 0000000000..a3e18c8b50
--- /dev/null
+++ b/scripts/dockerfiles/README.md
@@ -0,0 +1,56 @@
+### Install Gogs With Docker
+
+Deploying gogs using [Docker](http://www.docker.io/) is as easy as pie. Simple
+open the `/dockerfiles/build.sh` file and replace the initial configuration
+settings:
+
+```
+DB_TYPE="YOUR_DB_TYPE" # type of database, supports either 'mysql' or 'postgres'
+MEM_TYPE="YOUR_MEM_TYPE" # type of memory database, supports either 'redis' or 'memcache'
+DB_PASSWORD="YOUR_DB_PASSWORD" # The database password
+DB_RUN_NAME="YOUR_DB_RUN_NAME" # The --name option value to use when running the database image
+MEM_RUN_NAME="YOUR_MEM_RUN_NAME" # The --name option value to use when running the memory database image
+HOST_PORT="YOUR_HOST_PORT" # The port to expose the app on (redirected to 3000 inside the gogs container)
+```
+
+And run:
+```
+cd dockerfiles
+./build.sh
+```
+
+The build will take some time, just be patient. After it finishes, it will
+display a message that looks like this (the content may be different, depending
+on your configuration options):
+
+```
+Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service:
+docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs
+```
+
+To run the container, just copy the above command:
+
+```
+docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs
+```
+
+Now gogs should be running! Open your browser and navigate to:
+
+```
+http://YOUR_HOST_IP:YOUR_HOST_PORT
+```
+
+During the installation procedure, use the following information:
+
+- The database type should be whichever `DB_TYPE` you selected above
+
+- The database host should be either `db:5432` or `db:3306` for PostgreSQL and
+ MySQL respectively
+
+- The `RUN_USER` should be whichever user you're running the container with.
+ Ideally that's `git`, but your individual configuration may vary
+
+- Everything else is configured like a normal gogs installation
+
+Let's 'gogs'!
+Ouya~
diff --git a/dockerfiles/build.sh b/scripts/dockerfiles/build.sh
similarity index 98%
rename from dockerfiles/build.sh
rename to scripts/dockerfiles/build.sh
index b658db4ecd..4617da1421 100755
--- a/dockerfiles/build.sh
+++ b/scripts/dockerfiles/build.sh
@@ -10,6 +10,9 @@ HOST_PORT="YOUR_HOST_PORT" # The port on host, which will be redirected t
# apt source, you can select 'nchc'(mirror in Taiwan) or 'aliyun'(best for mainlance China users) according to your network, if you could connect to the official unbunt mirror in a fast speed, just leave it to "".
APT_SOURCE=""
+# fail immediately if anything goes wrong
+set -e
+
DOCKER_BIN=$(which docker.io || which docker)
if [ -z "$DOCKER_BIN" ] ; then
echo "Please install docker. You can install docker by running \"wget -qO- https://get.docker.io/ | sh\"."
diff --git a/dockerfiles/images/gogits/Dockerfile b/scripts/dockerfiles/images/gogits/Dockerfile
similarity index 97%
rename from dockerfiles/images/gogits/Dockerfile
rename to scripts/dockerfiles/images/gogits/Dockerfile
index 1f67d41ed9..a171e15e3b 100644
--- a/dockerfiles/images/gogits/Dockerfile
+++ b/scripts/dockerfiles/images/gogits/Dockerfile
@@ -13,7 +13,7 @@ ENV GOPATH /go
RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential
RUN apt-get install -yq vim sudo
-RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
+RUN curl -sL https://golang.org/dl/go1.3.linux-amd64.tar.gz | tar -v -C /usr/local -xz
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
RUN go get -u -d github.com/gogits/gogs
diff --git a/dockerfiles/images/gogits/deploy.sh b/scripts/dockerfiles/images/gogits/deploy.sh
similarity index 100%
rename from dockerfiles/images/gogits/deploy.sh
rename to scripts/dockerfiles/images/gogits/deploy.sh
diff --git a/dockerfiles/images/memcache/.gitkeep b/scripts/dockerfiles/images/memcache/.gitkeep
similarity index 100%
rename from dockerfiles/images/memcache/.gitkeep
rename to scripts/dockerfiles/images/memcache/.gitkeep
diff --git a/dockerfiles/images/memcache/Dockerfile b/scripts/dockerfiles/images/memcache/Dockerfile
similarity index 100%
rename from dockerfiles/images/memcache/Dockerfile
rename to scripts/dockerfiles/images/memcache/Dockerfile
diff --git a/dockerfiles/images/mysql/.gitkeep b/scripts/dockerfiles/images/mysql/.gitkeep
similarity index 100%
rename from dockerfiles/images/mysql/.gitkeep
rename to scripts/dockerfiles/images/mysql/.gitkeep
diff --git a/dockerfiles/images/mysql/Dockerfile b/scripts/dockerfiles/images/mysql/Dockerfile
similarity index 100%
rename from dockerfiles/images/mysql/Dockerfile
rename to scripts/dockerfiles/images/mysql/Dockerfile
diff --git a/dockerfiles/images/postgres/.gitkeep b/scripts/dockerfiles/images/postgres/.gitkeep
similarity index 100%
rename from dockerfiles/images/postgres/.gitkeep
rename to scripts/dockerfiles/images/postgres/.gitkeep
diff --git a/dockerfiles/images/postgres/Dockerfile b/scripts/dockerfiles/images/postgres/Dockerfile
similarity index 100%
rename from dockerfiles/images/postgres/Dockerfile
rename to scripts/dockerfiles/images/postgres/Dockerfile
diff --git a/dockerfiles/images/redis/.gitkeep b/scripts/dockerfiles/images/redis/.gitkeep
similarity index 100%
rename from dockerfiles/images/redis/.gitkeep
rename to scripts/dockerfiles/images/redis/.gitkeep
diff --git a/dockerfiles/images/redis/Dockerfile b/scripts/dockerfiles/images/redis/Dockerfile
similarity index 100%
rename from dockerfiles/images/redis/Dockerfile
rename to scripts/dockerfiles/images/redis/Dockerfile
diff --git a/dockerfiles/run.sh b/scripts/dockerfiles/run.sh
similarity index 100%
rename from dockerfiles/run.sh
rename to scripts/dockerfiles/run.sh
diff --git a/gogs_supervisord.sh b/scripts/gogs_supervisord.sh
similarity index 81%
rename from gogs_supervisord.sh
rename to scripts/gogs_supervisord.sh
index 43908094b5..3038407ed4 100755
--- a/gogs_supervisord.sh
+++ b/scripts/gogs_supervisord.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-echo 'plase remember to modify the command path in etc/conf/supervisord.conf(line 23)'
+echo 'plase remember to modify the command path in etc/supervisord.conf(line 23)'
PID="/tmp/supervisord.pid"
-CONF="conf/etc/supervisord.conf"
+CONF="etc/supervisord.conf"
LOGDIR="log"
if [ ! -d $LOGDIR ]; then
diff --git a/scripts/mysql.sql b/scripts/mysql.sql
new file mode 100644
index 0000000000..cacd76cf70
--- /dev/null
+++ b/scripts/mysql.sql
@@ -0,0 +1,2 @@
+DROP DATABASE IF EXISTS gogs;
+CREATE DATABASE IF NOT EXISTS gogs CHARACTER SET utf8 COLLATE utf8_general_ci;
diff --git a/scripts/start.bat b/scripts/start.bat
new file mode 100644
index 0000000000..dfe84c0f85
--- /dev/null
+++ b/scripts/start.bat
@@ -0,0 +1,2 @@
+@echo off
+..\\gogs.exe web
diff --git a/start.sh b/scripts/start.sh
similarity index 100%
rename from start.sh
rename to scripts/start.sh
diff --git a/start.bat b/start.bat
deleted file mode 100644
index 02972b92da..0000000000
--- a/start.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-gogs.exe web
diff --git a/templates/.VERSION b/templates/.VERSION
new file mode 100644
index 0000000000..a4f4593d76
--- /dev/null
+++ b/templates/.VERSION
@@ -0,0 +1 @@
+0.4.7.0726 Alpha
\ No newline at end of file
diff --git a/templates/VERSION b/templates/VERSION
deleted file mode 100644
index 7b53a20867..0000000000
--- a/templates/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.4.5.0712 Alpha
\ No newline at end of file
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 10a53b5397..34e710bf62 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -176,11 +176,11 @@
Enable Set Cookie
GC Interval Time
- {{.SessionConfig.GcIntervalTime}} seconds
+ {{.SessionConfig.Gclifetime}} seconds
Session Life Time
- {{.SessionConfig.SessionLifeTime}} seconds
+ {{.SessionConfig.Maxlifetime}} seconds
HTTPS Only
- Cookie Life Time
{{.SessionConfig.CookieLifeTime}} seconds
Session ID Hash Function
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 8288d21e15..249bce314d 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,27 +1,72 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-
`), -1) - } - ctx.Data["FileContent"] = string(buf) - } - } - } } - ctx.Data["Username"] = userName - ctx.Data["Reponame"] = repoName - - var treenames []string - Paths := make([]string, 0) - - if len(treename) > 0 { - treenames = strings.Split(treename, "/") - for i, _ := range treenames { - Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) - } - - ctx.Data["HasParentPath"] = true - if len(Paths)-2 >= 0 { - ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] - } - } - - ctx.Data["LastCommit"] = ctx.Repo.Commit - ctx.Data["Paths"] = Paths - ctx.Data["TreeName"] = treename - ctx.Data["Treenames"] = treenames - ctx.Data["TreePath"] = treePath - ctx.Data["BranchLink"] = branchLink - ctx.HTML(200, SINGLE) -} - -func basicEncode(username, password string) string { - auth := username + ":" + password - return base64.StdEncoding.EncodeToString([]byte(auth)) -} - -func basicDecode(encoded string) (user string, name string, err error) { - var s []byte - s, err = base64.StdEncoding.DecodeString(encoded) - if err != nil { - return - } - - a := strings.Split(string(s), ":") - if len(a) == 2 { - user, name = a[0], a[1] - } else { - err = errors.New("decode failed") - } - return -} - -func authRequired(ctx *middleware.Context) { - ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"") - ctx.Data["ErrorMsg"] = "no basic auth and digit auth" - ctx.HTML(401, base.TplName("status/401")) -} - -func Action(ctx *middleware.Context, params martini.Params) { - var err error - switch params["action"] { - case "watch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) - case "unwatch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) - case "desc": - if !ctx.Repo.IsOwner { - ctx.Error(404) + archivePath = path.Join(archivePath, ctx.Repo.CommitId+ext) + if !com.IsFile(archivePath) { + if err := ctx.Repo.Commit.CreateArchive(archivePath, git.ZIP); err != nil { + ctx.Handle(500, "Download -> CreateArchive "+archivePath, err) return } - - ctx.Repo.Repository.Description = ctx.Query("desc") - ctx.Repo.Repository.Website = ctx.Query("site") - err = models.UpdateRepository(ctx.Repo.Repository) } - if err != nil { - log.Error("repo.Action(%s): %v", params["action"], err) - ctx.JSON(200, map[string]interface{}{ - "ok": false, - "err": err.Error(), - }) - return - } - ctx.JSON(200, map[string]interface{}{ - "ok": true, - }) + ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(ctx.Repo.CommitId)+ext) } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 5a57f76075..26f391346e 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-martini/martini" + "github.com/Unknwon/com" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -74,7 +74,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Repository.IsPrivate = form.Private ctx.Repo.Repository.IsGoget = form.GoGet if err := models.UpdateRepository(ctx.Repo.Repository); err != nil { - ctx.Handle(404, "setting.SettingPost(update)", err) + ctx.Handle(404, "UpdateRepository", err) return } log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) @@ -84,7 +84,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Mirror.Interval = form.Interval ctx.Repo.Mirror.NextUpdate = time.Now().Add(time.Duration(form.Interval) * time.Hour) if err := models.UpdateMirror(ctx.Repo.Mirror); err != nil { - log.Error("setting.SettingPost(UpdateMirror): %v", err) + log.Error(4, "UpdateMirror: %v", err) } } } @@ -227,7 +227,7 @@ func WebHooks(ctx *middleware.Context) { ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhooks" // Delete webhook. - remove, _ := base.StrTo(ctx.Query("remove")).Int64() + remove := com.StrTo(ctx.Query("remove")).MustInt64() if remove > 0 { if err := models.DeleteWebhook(remove); err != nil { ctx.Handle(500, "setting.WebHooks(DeleteWebhook)", err) @@ -290,11 +290,11 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks") } -func WebHooksEdit(ctx *middleware.Context, params martini.Params) { +func WebHooksEdit(ctx *middleware.Context) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEdit", nil) return @@ -315,11 +315,11 @@ func WebHooksEdit(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, HOOK_EDIT) } -func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth.NewWebhookForm) { +func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEditPost", nil) return @@ -328,9 +328,9 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. w, err := models.GetWebhookById(hookId) if err != nil { if err == models.ErrWebhookNotExist { - ctx.Handle(404, "setting.WebHooksEditPost(GetWebhookById)", nil) + ctx.Handle(404, "GetWebhookById", nil) } else { - ctx.Handle(500, "setting.WebHooksEditPost(GetWebhookById)", err) + ctx.Handle(500, "GetWebhookById", err) } return } @@ -353,10 +353,10 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. } w.IsActive = form.Active if err := w.UpdateEvent(); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(UpdateEvent)", err) + ctx.Handle(500, "UpdateEvent", err) return } else if err := models.UpdateWebhook(w); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(WebHooksEditPost)", err) + ctx.Handle(500, "WebHooksEditPost", err) return } diff --git a/routers/repo/view.go b/routers/repo/view.go new file mode 100644 index 0000000000..9562bb785b --- /dev/null +++ b/routers/repo/view.go @@ -0,0 +1,203 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "bytes" + "io/ioutil" + "path" + "path/filepath" + "strings" + + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" + "github.com/gogits/gogs/modules/middleware" +) + +const ( + HOME base.TplName = "repo/home" +) + +func Home(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Repo.Repository.Name + + branchName := ctx.Repo.BranchName + userName := ctx.Repo.Owner.Name + repoName := ctx.Repo.Repository.Name + + repoLink := ctx.Repo.RepoLink + branchLink := ctx.Repo.RepoLink + "/src/" + branchName + rawLink := ctx.Repo.RepoLink + "/raw/" + branchName + + // Get tree path + treename := ctx.Params("*") + + if len(treename) > 0 && treename[len(treename)-1] == '/' { + ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1]) + return + } + + ctx.Data["IsRepoToolbarSource"] = true + + isViewBranch := ctx.Repo.IsBranch + ctx.Data["IsViewBranch"] = isViewBranch + + treePath := treename + if len(treePath) != 0 { + treePath = treePath + "/" + } + + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) + if err != nil && err != git.ErrNotExist { + ctx.Handle(404, "GetTreeEntryByPath", err) + return + } + + if len(treename) != 0 && entry == nil { + ctx.Handle(404, "repo.Home", nil) + return + } + + if entry != nil && !entry.IsDir() { + blob := entry.Blob() + + if dataRc, err := blob.Data(); err != nil { + ctx.Handle(404, "blob.Data", err) + return + } else { + ctx.Data["FileSize"] = blob.Size() + ctx.Data["IsFile"] = true + ctx.Data["FileName"] = blob.Name() + ext := path.Ext(blob.Name()) + if len(ext) > 0 { + ext = ext[1:] + } + ctx.Data["FileExt"] = ext + ctx.Data["FileLink"] = rawLink + "/" + treename + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + _, isTextFile := base.IsTextFile(buf) + _, isImageFile := base.IsImageFile(buf) + ctx.Data["IsFileText"] = isTextFile + + switch { + case isImageFile: + ctx.Data["IsImageFile"] = true + case isTextFile: + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) + ctx.Data["ReadmeExist"] = readmeExist + if readmeExist { + ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, "")) + } else { + ctx.Data["FileContent"] = string(buf) + } + } + } + } else { + // Directory and file list. + tree, err := ctx.Repo.Commit.SubTree(treename) + if err != nil { + ctx.Handle(404, "SubTree", err) + return + } + entries, err := tree.ListEntries(treename) + if err != nil { + ctx.Handle(500, "ListEntries", err) + return + } + entries.Sort() + + files := make([][]interface{}, 0, len(entries)) + + for _, te := range entries { + c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) + if err != nil { + ctx.Handle(404, "GetCommitOfRelPath", err) + return + } + + files = append(files, []interface{}{te, c}) + } + + ctx.Data["Files"] = files + + var readmeFile *git.Blob + + for _, f := range entries { + if f.IsDir() || !base.IsReadmeFile(f.Name()) { + continue + } else { + readmeFile = f.Blob() + break + } + } + + if readmeFile != nil { + ctx.Data["ReadmeInHome"] = true + ctx.Data["ReadmeExist"] = true + if dataRc, err := readmeFile.Data(); err != nil { + ctx.Handle(404, "repo.SinglereadmeFile.LookupBlob", err) + return + } else { + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + ctx.Data["FileSize"] = readmeFile.Size() + ctx.Data["FileLink"] = rawLink + "/" + treename + _, isTextFile := base.IsTextFile(buf) + ctx.Data["FileIsText"] = isTextFile + ctx.Data["FileName"] = readmeFile.Name() + if isTextFile { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + switch { + case base.IsMarkdownFile(readmeFile.Name()): + buf = base.RenderMarkdown(buf, branchLink) + default: + buf = bytes.Replace(buf, []byte("\n"), []byte(`
`), -1) + } + ctx.Data["FileContent"] = string(buf) + } + } + } + } + + ctx.Data["Username"] = userName + ctx.Data["Reponame"] = repoName + + var treenames []string + Paths := make([]string, 0) + + if len(treename) > 0 { + treenames = strings.Split(treename, "/") + for i, _ := range treenames { + Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) + } + + ctx.Data["HasParentPath"] = true + if len(Paths)-2 >= 0 { + ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] + } + } + + ctx.Data["LastCommit"] = ctx.Repo.Commit + ctx.Data["Paths"] = Paths + ctx.Data["TreeName"] = treename + ctx.Data["Treenames"] = treenames + ctx.Data["TreePath"] = treePath + ctx.Data["BranchLink"] = branchLink + ctx.HTML(200, HOME) +} diff --git a/routers/user/auth.go b/routers/user/auth.go new file mode 100644 index 0000000000..163df34a4a --- /dev/null +++ b/routers/user/auth.go @@ -0,0 +1,442 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package user + +import ( + "net/url" + "strings" + + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/auth" + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/captcha" + "github.com/gogits/gogs/modules/log" + // "github.com/gogits/gogs/modules/mailer" + "github.com/gogits/gogs/modules/middleware" + "github.com/gogits/gogs/modules/setting" +) + +const ( + SIGNIN base.TplName = "user/signin" + SIGNUP base.TplName = "user/signup" + DELETE base.TplName = "user/delete" + ACTIVATE base.TplName = "user/activate" + FORGOT_PASSWORD base.TplName = "user/forgot_passwd" + RESET_PASSWORD base.TplName = "user/reset_passwd" +) + +func SignIn(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("sign_in") + + // if _, ok := ctx.Session.Get("socialId").(int64); ok { + // ctx.Data["IsSocialLogin"] = true + // ctx.HTML(200, SIGNIN) + // return + // } + + // if setting.OauthService != nil { + // ctx.Data["OauthEnabled"] = true + // ctx.Data["OauthService"] = setting.OauthService + // } + + // Check auto-login. + uname := ctx.GetCookie(setting.CookieUserName) + if len(uname) == 0 { + ctx.HTML(200, SIGNIN) + return + } + + isSucceed := false + defer func() { + if !isSucceed { + log.Trace("auto-login cookie cleared: %s", uname) + ctx.SetCookie(setting.CookieUserName, "", -1) + ctx.SetCookie(setting.CookieRememberName, "", -1) + return + } + }() + + u, err := models.GetUserByName(uname) + if err != nil { + if err != models.ErrUserNotExist { + ctx.Handle(500, "GetUserByName", err) + } + return + } + + if val, _ := ctx.GetSuperSecureCookie( + base.EncodeMd5(u.Rands+u.Passwd), setting.CookieRememberName); val != u.Name { + ctx.HTML(200, SIGNIN) + return + } + + isSucceed = true + + ctx.Session.Set("uid", u.Id) + ctx.Session.Set("uname", u.Name) + if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { + ctx.SetCookie("redirect_to", "", -1) + ctx.Redirect(redirectTo) + return + } + + ctx.Redirect("/") +} + +func SignInPost(ctx *middleware.Context, form auth.SignInForm) { + ctx.Data["Title"] = ctx.Tr("sign_in") + + // sid, isOauth := ctx.Session.Get("socialId").(int64) + // if isOauth { + // ctx.Data["IsSocialLogin"] = true + // } else if setting.OauthService != nil { + // ctx.Data["OauthEnabled"] = true + // ctx.Data["OauthService"] = setting.OauthService + // } + + if ctx.HasError() { + ctx.HTML(200, SIGNIN) + return + } + + u, err := models.UserSignIn(form.UserName, form.Password) + if err != nil { + if err == models.ErrUserNotExist { + ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &form) + return + } + + ctx.Handle(500, "UserSignIn", err) + return + } + + if form.Remember { + days := 86400 * setting.LogInRememberDays + ctx.SetCookie(setting.CookieUserName, u.Name, days) + ctx.SetSuperSecureCookie(base.EncodeMd5(u.Rands+u.Passwd), + setting.CookieRememberName, u.Name, days) + } + + // Bind with social account. + // if isOauth { + // if err = models.BindUserOauth2(user.Id, sid); err != nil { + // if err == models.ErrOauth2RecordNotExist { + // ctx.Handle(404, "user.SignInPost(GetOauth2ById)", err) + // } else { + // ctx.Handle(500, "user.SignInPost(GetOauth2ById)", err) + // } + // return + // } + // ctx.Session.Delete("socialId") + // log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid) + // } + + ctx.Session.Set("uid", u.Id) + ctx.Session.Set("uname", u.Name) + if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { + ctx.SetCookie("redirect_to", "", -1) + ctx.Redirect(redirectTo) + return + } + + ctx.Redirect("/") +} + +func SignOut(ctx *middleware.Context) { + ctx.Session.Delete("uid") + ctx.Session.Delete("uname") + // ctx.Session.Delete("socialId") + // ctx.Session.Delete("socialName") + // ctx.Session.Delete("socialEmail") + ctx.SetCookie(setting.CookieUserName, "", -1) + ctx.SetCookie(setting.CookieRememberName, "", -1) + ctx.Redirect("/") +} + +func SignUp(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("sign_up") + + if setting.Service.DisableRegistration { + ctx.Data["DisableRegistration"] = true + ctx.HTML(200, SIGNUP) + return + } + + // if sid, ok := ctx.Session.Get("socialId").(int64); ok { + // oauthSignUp(ctx, sid) + // return + // } + + ctx.HTML(200, SIGNUP) +} + +// func oauthSignUp(ctx *middleware.Context, sid int64) { +// ctx.Data["Title"] = "OAuth Sign Up" +// ctx.Data["PageIsSignUp"] = true + +// if _, err := models.GetOauth2ById(sid); err != nil { +// if err == models.ErrOauth2RecordNotExist { +// ctx.Handle(404, "user.oauthSignUp(GetOauth2ById)", err) +// } else { +// ctx.Handle(500, "user.oauthSignUp(GetOauth2ById)", err) +// } +// return +// } + +// ctx.Data["IsSocialLogin"] = true +// ctx.Data["username"] = strings.Replace(ctx.Session.Get("socialName").(string), " ", "", -1) +// ctx.Data["email"] = ctx.Session.Get("socialEmail") +// log.Trace("user.oauthSignUp(social ID): %v", ctx.Session.Get("socialId")) +// ctx.HTML(200, SIGNUP) +// } + +func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.RegisterForm) { + ctx.Data["Title"] = ctx.Tr("sign_up") + + if setting.Service.DisableRegistration { + ctx.Error(403) + return + } + + isOauth := false + // sid, isOauth := ctx.Session.Get("socialId").(int64) + // if isOauth { + // ctx.Data["IsSocialLogin"] = true + // } + + // May redirect from home page. + if ctx.Query("from") == "home" { + // Clear input error box. + ctx.Data["Err_UserName"] = false + ctx.Data["Err_Email"] = false + + // Make the best guess. + uname := ctx.Query("uname") + i := strings.Index(uname, "@") + if i > -1 { + ctx.Data["email"] = uname + ctx.Data["uname"] = uname[:i] + } else { + ctx.Data["uname"] = uname + } + ctx.Data["password"] = ctx.Query("password") + ctx.HTML(200, SIGNUP) + return + } + + if ctx.HasError() { + ctx.HTML(200, SIGNUP) + return + } + + if !cpt.VerifyReq(ctx.Req) { + ctx.Data["Err_Captcha"] = true + ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), SIGNUP, &form) + return + } else if form.Password != form.Retype { + ctx.Data["Err_Password"] = true + ctx.RenderWithErr(ctx.Tr("form.password_not_match"), SIGNUP, &form) + return + } + + u := &models.User{ + Name: form.UserName, + Email: form.Email, + Passwd: form.Password, + IsActive: !setting.Service.RegisterEmailConfirm || isOauth, + } + + if err := models.CreateUser(u); err != nil { + switch err { + case models.ErrUserAlreadyExist: + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SIGNUP, &form) + case models.ErrEmailAlreadyUsed: + ctx.Data["Err_Email"] = true + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SIGNUP, &form) + case models.ErrUserNameIllegal: + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SIGNUP, &form) + default: + ctx.Handle(500, "CreateUser", err) + } + return + } + log.Trace("Account created: %s", u.Name) + + // Bind social account. + // if isOauth { + // if err = models.BindUserOauth2(u.Id, sid); err != nil { + // ctx.Handle(500, "user.SignUp(BindUserOauth2)", err) + // return + // } + // ctx.Session.Delete("socialId") + // log.Trace("%s OAuth binded: %s -> %d", ctx.Req.RequestURI, form.UserName, sid) + // } + + // Send confirmation e-mail, no need for social account. + // if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 { + // mailer.SendRegisterMail(ctx.Render, u) + // ctx.Data["IsSendRegisterMail"] = true + // ctx.Data["Email"] = u.Email + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // ctx.HTML(200, "user/activate") + + // if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + // return + // } + + ctx.Redirect("/user/login") +} + +func Activate(ctx *middleware.Context) { + // code := ctx.Query("code") + // if len(code) == 0 { + // ctx.Data["IsActivatePage"] = true + // if ctx.User.IsActive { + // ctx.Handle(404, "user.Activate", nil) + // return + // } + // // Resend confirmation e-mail. + // if setting.Service.RegisterEmailConfirm { + // if ctx.Cache.IsExist("MailResendLimit_" + ctx.User.LowerName) { + // ctx.Data["ResendLimited"] = true + // } else { + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // mailer.SendActiveMail(ctx.Render, ctx.User) + + // if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + // } + // } else { + // ctx.Data["ServiceNotEnabled"] = true + // } + // ctx.HTML(200, ACTIVATE) + // return + // } + + // // Verify code. + // if user := models.VerifyUserActiveCode(code); user != nil { + // user.IsActive = true + // user.Rands = models.GetUserSalt() + // if err := models.UpdateUser(user); err != nil { + // ctx.Handle(404, "user.Activate", err) + // return + // } + + // log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.Name) + + // ctx.Session.Set("userId", user.Id) + // ctx.Session.Set("userName", user.Name) + // ctx.Redirect("/") + // return + // } + + // ctx.Data["IsActivateFailed"] = true + // ctx.HTML(200, ACTIVATE) +} + +func ForgotPasswd(ctx *middleware.Context) { + ctx.Data["Title"] = "Forgot Password" + + if setting.MailService == nil { + ctx.Data["IsResetDisable"] = true + ctx.HTML(200, FORGOT_PASSWORD) + return + } + + ctx.Data["IsResetRequest"] = true + ctx.HTML(200, FORGOT_PASSWORD) +} + +func ForgotPasswdPost(ctx *middleware.Context) { + // ctx.Data["Title"] = "Forgot Password" + + // if setting.MailService == nil { + // ctx.Handle(403, "user.ForgotPasswdPost", nil) + // return + // } + // ctx.Data["IsResetRequest"] = true + + // email := ctx.Query("email") + // u, err := models.GetUserByEmail(email) + // if err != nil { + // if err == models.ErrUserNotExist { + // ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil) + // } else { + // ctx.Handle(500, "user.ResetPasswd(check existence)", err) + // } + // return + // } + + // if ctx.Cache.IsExist("MailResendLimit_" + u.LowerName) { + // ctx.Data["ResendLimited"] = true + // ctx.HTML(200, FORGOT_PASSWORD) + // return + // } + + // mailer.SendResetPasswdMail(ctx.Render, u) + // if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { + // log.Error("Set cache(MailResendLimit) fail: %v", err) + // } + + // ctx.Data["Email"] = email + // ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + // ctx.Data["IsResetSent"] = true + // ctx.HTML(200, FORGOT_PASSWORD) +} + +func ResetPasswd(ctx *middleware.Context) { + ctx.Data["Title"] = "Reset Password" + + code := ctx.Query("code") + if len(code) == 0 { + ctx.Error(404) + return + } + ctx.Data["Code"] = code + ctx.Data["IsResetForm"] = true + ctx.HTML(200, RESET_PASSWORD) +} + +func ResetPasswdPost(ctx *middleware.Context) { + // ctx.Data["Title"] = "Reset Password" + + // code := ctx.Query("code") + // if len(code) == 0 { + // ctx.Error(404) + // return + // } + // ctx.Data["Code"] = code + + // if u := models.VerifyUserActiveCode(code); u != nil { + // // Validate password length. + // passwd := ctx.Query("passwd") + // if len(passwd) < 6 || len(passwd) > 30 { + // ctx.Data["IsResetForm"] = true + // ctx.RenderWithErr("Password length should be in 6 and 30.", "user/reset_passwd", nil) + // return + // } + + // u.Passwd = passwd + // u.Rands = models.GetUserSalt() + // u.Salt = models.GetUserSalt() + // u.EncodePasswd() + // if err := models.UpdateUser(u); err != nil { + // ctx.Handle(500, "user.ResetPasswd(UpdateUser)", err) + // return + // } + + // log.Trace("%s User password reset: %s", ctx.Req.RequestURI, u.Name) + // ctx.Redirect("/user/login") + // return + // } + + // ctx.Data["IsResetFailed"] = true + // ctx.HTML(200, RESET_PASSWORD) +} diff --git a/routers/user/home.go b/routers/user/home.go index 02dc1de154..b5a789ae0e 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -8,26 +8,25 @@ import ( "fmt" "github.com/Unknwon/com" - "github.com/go-martini/martini" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" ) const ( - DASHBOARD base.TplName = "user/dashboard" - PROFILE base.TplName = "user/profile" + DASHBOARD base.TplName = "user/dashboard/dashboard" ISSUES base.TplName = "user/issues" PULLS base.TplName = "user/pulls" STARS base.TplName = "user/stars" + PROFILE base.TplName = "user/profile" ) func Dashboard(ctx *middleware.Context) { - ctx.Data["Title"] = "Dashboard" - ctx.Data["PageIsUserDashboard"] = true + ctx.Data["Title"] = ctx.Tr("dashboard") + ctx.Data["PageIsDashboard"] = true + ctx.Data["PageIsNews"] = true if err := ctx.User.GetOrganizations(); err != nil { ctx.Handle(500, "home.Dashboard(GetOrganizations)", err) @@ -36,22 +35,25 @@ func Dashboard(ctx *middleware.Context) { ctx.Data["Orgs"] = ctx.User.Orgs ctx.Data["ContextUser"] = ctx.User - var err error - ctx.Data["MyRepos"], err = models.GetRepositories(ctx.User.Id, true) + repos, err := models.GetRepositories(ctx.User.Id, true) if err != nil { - ctx.Handle(500, "home.Dashboard(GetRepositories)", err) + ctx.Handle(500, "GetRepositories", err) return } + for _, repo := range repos { + repo.Owner = ctx.User + } + ctx.Data["Repos"] = repos ctx.Data["CollaborativeRepos"], err = models.GetCollaborativeRepos(ctx.User.Name) if err != nil { - ctx.Handle(500, "home.Dashboard(GetCollaborativeRepos)", err) + ctx.Handle(500, "GetCollaborativeRepos", err) return } - actions, err := models.GetFeeds(ctx.User.Id, 0, false) + actions, err := models.GetFeeds(ctx.User.Id, 0, true) if err != nil { - ctx.Handle(500, "home.Dashboard(GetFeeds)", err) + ctx.Handle(500, "GetFeeds", err) return } @@ -70,11 +72,11 @@ func Dashboard(ctx *middleware.Context) { ctx.HTML(200, DASHBOARD) } -func Profile(ctx *middleware.Context, params martini.Params) { +func Profile(ctx *middleware.Context) { ctx.Data["Title"] = "Profile" ctx.Data["PageIsUserProfile"] = true - u, err := models.GetUserByName(params["username"]) + u, err := models.GetUserByName(ctx.Params(":username")) if err != nil { if err == models.ErrUserNotExist { ctx.Handle(404, "user.Profile(GetUserByName)", err) @@ -133,26 +135,26 @@ const (
%s
- {{if not .Repos}}
- 
- {{else}}
-
Hey there, welcome to the land of Gogs!
-If you just got your Gogs server running, go to the install guide page, which will guide you through your initial setup.
-
- {{else}}
- Hey there, welcome to the land of Gogs!
-Here are some recent updated repositories:
-
-
+
+ -
- {{range .Repos}}
-
-
-
-
- {{.Name}} -
-{{.Description}}
-Last updated {{.Updated|TimeSince}}-
- {{end}}
-
+
-{{template "base/footer" .}}
+
+
- {{end}}
+ 
+
+
+
+
Gogs
+{{.i18n.Tr "app_desc"}}
+ + +
+
+{{template "ng/base/footer" .}}
\ No newline at end of file
diff --git a/templates/ng/base/alert.tmpl b/templates/ng/base/alert.tmpl
new file mode 100644
index 0000000000..df14d3c3bf
--- /dev/null
+++ b/templates/ng/base/alert.tmpl
@@ -0,0 +1,2 @@
+{{if .Flash.ErrorMsg}}{{.Flash.ErrorMsg}}{{end}}
+{{if .Flash.SuccessMsg}}
+ {{if eq .Lang "zh-CN"}}
+
+
+
+
+ 跨平台
+
+ 任何 Go 语言 支持的平台都可以运行 Gogs，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！
+
+
+ 轻量级
+
+ 一个廉价的树莓派的配置足以满足 Gogs 的最低系统硬件要求。最大程度上节省您的服务器资源！
+
+
+ 开源化
+
+ {{else}}
+ 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！
+
+
+ Easy to install
+
+ Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged.
+
+
+ Cross-platform
+
+ Gogs runs anywhere Go can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love!
+
+
+ Lightweight
+
+ Gogs has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!
+
+
+ Open Source
+
+ {{end}}
+ It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor!
+{{.Flash.SuccessMsg}}
{{end}}
\ No newline at end of file
diff --git a/templates/ng/base/footer.tmpl b/templates/ng/base/footer.tmpl
new file mode 100644
index 0000000000..734533a108
--- /dev/null
+++ b/templates/ng/base/footer.tmpl
@@ -0,0 +1,27 @@
+