diff --git a/README.md b/README.md index 1cb142db6..b6e7892c9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

logoAiForge - 启智AI开发协作平台

-[![release](https://img.shields.io/badge/release-1.21.9.2-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest) +[![release](https://img.shields.io/badge/release-1.21.11.1-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) diff --git a/models/issue.go b/models/issue.go index e1b871b0b..7457fcd45 100755 --- a/models/issue.go +++ b/models/issue.go @@ -1356,6 +1356,15 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { return accum, nil } +func GetPullCountByUserAndRepoId(repoId int64, userId int64) int64 { + issue := new(Issue) + total, err := x.Where("is_pull=true and repo_id=? and poster_id=?", repoId, userId).Count(issue) + if err != nil { + return 0 + } + return total +} + func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats, error) { stats := &IssueStats{} diff --git a/models/repo_activity_custom.go b/models/repo_activity_custom.go index 9cb7e4a09..7cfed2359 100644 --- a/models/repo_activity_custom.go +++ b/models/repo_activity_custom.go @@ -2,12 +2,19 @@ package models import ( "fmt" + "sort" "strings" "time" "code.gitea.io/gitea/modules/git" ) +type ContributorWithUserId struct { + git.Contributor + UserId int64 + IsAdmin bool +} + func GetRepoKPIStats(repo *Repository) (*git.RepoKPIStats, error) { wikiPath := "" if repo.HasWiki() { @@ -63,22 +70,39 @@ func getRepoKPIStats(repoPath string, wikiPath string) (*git.RepoKPIStats, error } if recentlyContributors != nil { + resentlyContributorDistinctDict := make(map[string]int, 0) for _, recentlyContributor := range recentlyContributors { user, err := GetUserByActivateEmail(recentlyContributor.Email) - var ok bool + if err == nil { - _, ok = contributorDistinctDict[user.Email] + value, ok := resentlyContributorDistinctDict[user.Email] + if !ok { + resentlyContributorDistinctDict[user.Email] = recentlyContributor.CommitCnt + } else { + resentlyContributorDistinctDict[user.Email] = value + recentlyContributor.CommitCnt + } + } else { - _, ok = contributorDistinctDict[recentlyContributor.Email] + value, ok := resentlyContributorDistinctDict[recentlyContributor.Email] + if !ok { + resentlyContributorDistinctDict[recentlyContributor.Email] = recentlyContributor.CommitCnt + } else { + resentlyContributorDistinctDict[recentlyContributor.Email] = value + recentlyContributor.CommitCnt + } + } - if !ok { + } + + for k, v := range resentlyContributorDistinctDict { + count, ok := contributorDistinctDict[k] + if ok && count == v { stats.ContributorsAdded++ - newContributersDict[recentlyContributor.Email] = struct{}{} } } + } stats.Contributors = int64(len(contributorDistinctDict)) @@ -101,6 +125,66 @@ func getRepoKPIStats(repoPath string, wikiPath string) (*git.RepoKPIStats, error } +func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) { + contributors, err := git.GetContributors(repoPath) + if err != nil { + return make([]ContributorWithUserId, 0), err + } + contributorDistinctDict := make(map[string]ContributorWithUserId, 0) + if contributors != nil { + for _, contributor := range contributors { + if strings.Compare(contributor.Email, "") == 0 { + continue + } + + user, err := GetUserByActivateEmail(contributor.Email) + if err == nil { + + value, ok := contributorDistinctDict[user.Email] + if !ok { + contributorDistinctDict[user.Email] = ContributorWithUserId{ + contributor, + user.ID, + user.IsAdmin, + } + } else { + + value.CommitCnt += contributor.CommitCnt + } + + } else { + value, ok := contributorDistinctDict[contributor.Email] + if !ok { + contributorDistinctDict[contributor.Email] = ContributorWithUserId{ + contributor, + -1, + false, + } + } else { + value.CommitCnt += contributor.CommitCnt + } + + } + + } + v := make([]ContributorWithUserId, 0, len(contributorDistinctDict)) + for _, value := range contributorDistinctDict { + v = append(v, value) + } + + sort.Slice(v, func(i, j int) bool { + return v[i].CommitCnt > v[j].CommitCnt + }) + + if len(v) <= 10 { + return v, nil + } else { + return v[0:10], nil + } + } + return make([]ContributorWithUserId, 0), nil +} + func setKeyContributerDict(contributorDistinctDict map[string]int, email string, keyContributorsDict map[string]struct{}) { if contributorDistinctDict[email] >= 3 { _, ok := keyContributorsDict[email] diff --git a/models/repo_collaboration.go b/models/repo_collaboration.go index 4bb95cd05..bc71ad379 100644 --- a/models/repo_collaboration.go +++ b/models/repo_collaboration.go @@ -114,6 +114,17 @@ func (repo *Repository) isCollaborator(e Engine, userID int64) (bool, error) { return e.Get(&Collaboration{RepoID: repo.ID, UserID: userID}) } +func (repo *Repository) GetCollaboratorMode(userID int64) int { + collaboration := &Collaboration{RepoID: repo.ID, UserID: userID} + has, err := x.Get(&collaboration) + if err != nil || !has { + return -1 + } else { + return int(collaboration.Mode) + } + +} + // IsCollaborator check if a user is a collaborator of a repository func (repo *Repository) IsCollaborator(userID int64) (bool, error) { return repo.isCollaborator(x, userID) diff --git a/models/repo_statistic.go b/models/repo_statistic.go index adef672e0..df065bb79 100755 --- a/models/repo_statistic.go +++ b/models/repo_statistic.go @@ -9,56 +9,56 @@ import ( // RepoStatistic statistic info of all repository type RepoStatistic struct { - ID int64 `xorm:"pk autoincr"` - RepoID int64 `xorm:"unique(s) NOT NULL"` - Name string `xorm:"INDEX"` - IsPrivate bool - Date string `xorm:"unique(s) NOT NULL"` - NumWatches int64 `xorm:"NOT NULL DEFAULT 0"` - NumWatchesAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumStars int64 `xorm:"NOT NULL DEFAULT 0"` - NumStarsAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumForks int64 `xorm:"NOT NULL DEFAULT 0"` - NumForksAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumDownloads int64 `xorm:"NOT NULL DEFAULT 0"` - NumDownloadsAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumComments int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommentsAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumVisits int64 `xorm:"NOT NULL DEFAULT 0"` - NumClosedIssues int64 `xorm:"NOT NULL DEFAULT 0"` - NumClosedIssuesAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumVersions int64 `xorm:"NOT NULL DEFAULT 0"` - NumDevMonths int64 `xorm:"NOT NULL DEFAULT 0"` - RepoSize int64 `xorm:"NOT NULL DEFAULT 0"` - DatasetSize int64 `xorm:"NOT NULL DEFAULT 0"` - NumModels int64 `xorm:"NOT NULL DEFAULT 0"` - NumWikiViews int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommits int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommitsAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumIssues int64 `xorm:"NOT NULL DEFAULT 0"` - NumIssuesAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumPulls int64 `xorm:"NOT NULL DEFAULT 0"` - NumPullsAdded int64 `xorm:"NOT NULL DEFAULT 0"` - IssueFixedRate float32 `xorm:"NOT NULL"` - NumContributor int64 `xorm:"NOT NULL DEFAULT 0"` - NumContributorAdded int64 `xorm:"NOT NULL DEFAULT 0"` - NumKeyContributor int64 `xorm:"NOT NULL DEFAULT 0"` - - NumContributorsGrowth int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommitsGrowth int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommitLinesGrowth int64 `xorm:"NOT NULL DEFAULT 0"` - NumIssuesGrowth int64 `xorm:"NOT NULL DEFAULT 0"` - NumCommentsGrowth int64 `xorm:"NOT NULL DEFAULT 0"` - - Impact float64 `xorm:"NOT NULL DEFAULT 0"` - Completeness float64 `xorm:"NOT NULL DEFAULT 0"` - Liveness float64 `xorm:"NOT NULL DEFAULT 0"` - ProjectHealth float64 `xorm:"NOT NULL DEFAULT 0"` - TeamHealth float64 `xorm:"NOT NULL DEFAULT 0"` - Growth float64 `xorm:"NOT NULL DEFAULT 0"` - RadarTotal float64 `xorm:"NOT NULL DEFAULT 0"` - CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` - UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` + ID int64 `xorm:"pk autoincr" json:"-"` + RepoID int64 `xorm:"unique(s) NOT NULL" json:"repo_id"` + Name string `xorm:"INDEX" json:"name"` + IsPrivate bool `json:"isPrivate"` + Date string `xorm:"unique(s) NOT NULL" json:"date"` + NumWatches int64 `xorm:"NOT NULL DEFAULT 0" json:"watch"` + NumWatchesAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumStars int64 `xorm:"NOT NULL DEFAULT 0" json:"star"` + NumStarsAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumForks int64 `xorm:"NOT NULL DEFAULT 0" json:"fork"` + NumForksAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumDownloads int64 `xorm:"NOT NULL DEFAULT 0" json:"download"` + NumDownloadsAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumComments int64 `xorm:"NOT NULL DEFAULT 0" json:"comment"` + NumCommentsAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumVisits int64 `xorm:"NOT NULL DEFAULT 0" json:"view"` + NumClosedIssues int64 `xorm:"NOT NULL DEFAULT 0" json:"issueClosed"` + NumClosedIssuesAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumVersions int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumDevMonths int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + RepoSize int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + DatasetSize int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumModels int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumWikiViews int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumCommits int64 `xorm:"NOT NULL DEFAULT 0" json:"commit"` + NumCommitsAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumIssues int64 `xorm:"NOT NULL DEFAULT 0" json:"issue"` + NumIssuesAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumPulls int64 `xorm:"NOT NULL DEFAULT 0" json:"pr"` + NumPullsAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + IssueFixedRate float32 `xorm:"NOT NULL" json:"issueClosedRatio"` + NumContributor int64 `xorm:"NOT NULL DEFAULT 0" json:"contributor"` + NumContributorAdded int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumKeyContributor int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + + NumContributorsGrowth int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumCommitsGrowth int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumCommitLinesGrowth int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumIssuesGrowth int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + NumCommentsGrowth int64 `xorm:"NOT NULL DEFAULT 0" json:"-"` + + Impact float64 `xorm:"NOT NULL DEFAULT 0" json:"impact"` + Completeness float64 `xorm:"NOT NULL DEFAULT 0" json:"completeness"` + Liveness float64 `xorm:"NOT NULL DEFAULT 0" json:"liveness"` + ProjectHealth float64 `xorm:"NOT NULL DEFAULT 0" json:"projectHealth"` + TeamHealth float64 `xorm:"NOT NULL DEFAULT 0" json:"teamHealth"` + Growth float64 `xorm:"NOT NULL DEFAULT 0" json:"growth"` + RadarTotal float64 `xorm:"NOT NULL DEFAULT 0" json:"openi"` + CreatedUnix timeutil.TimeStamp `xorm:"INDEX created" json:"-"` + UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` } func DeleteRepoStatDaily(date string) error { @@ -81,9 +81,60 @@ func DeleteRepoStatDaily(date string) error { return nil } -func GetRepoStatisticByDate(date string) ([]*RepoStatistic, error) { +func CountRepoStatByRawSql(sql string) (int64, error) { + + return xStatistic.SQL(sql).Count() + +} + +func GetRepoStatisticByRawSql(sql string) []*RepoStatistic { repoStatistics := make([]*RepoStatistic, 0) - err := xStatistic.Where("date = ?", date).Find(&repoStatistics) + xStatistic.SQL(sql).Find(&repoStatistics) + return repoStatistics +} + +func GetRepoStatLastUpdatedTime(repoId ...string) (string, string, error) { + + repoStatistic := new(RepoStatistic) + var has bool + var err error + if len(repoId) == 0 { + has, err = xStatistic.Desc("created_unix").Limit(1).Cols("created_unix", "date").Get(repoStatistic) + + } else { + has, err = xStatistic.Where("repo_id=?", repoId[0]).Desc("created_unix").Limit(1).Cols("created_unix", "date").Get(repoStatistic) + } + + if err != nil { + return "", "", err + } else { + if has { + return repoStatistic.CreatedUnix.Format("2006-01-02 15:04:05"), repoStatistic.Date, nil + } else { + return "", "", fmt.Errorf("Can not get the latest record.") + } + } + +} + +func GetRepoStatisticByDateAndRepoId(date string, repoId int64) (*RepoStatistic, error) { + repoStatistic := new(RepoStatistic) + has, err := xStatistic.Where("date=? and repo_id=?", date, repoId).Get(repoStatistic) + if err != nil { + return nil, err + } else { + if has { + return repoStatistic, nil + } else { + return nil, fmt.Errorf("The num of return records is 0.") + } + } + +} + +func GetRepoStatisticByDate(date string, repoId int64) ([]*RepoStatistic, error) { + repoStatistics := make([]*RepoStatistic, 0) + err := xStatistic.Where("date = ? and repo_id=?", date, repoId).Find(&repoStatistics) return repoStatistics, err } @@ -107,6 +158,13 @@ func InsertRepoStat(repoStat *RepoStatistic) (int64, error) { return xStatistic.Insert(repoStat) } +func RestoreRepoStatFork(numForks int64, repoId int64) error { + sql := "update repo_statistic set num_forks=? where repo_id=?" + + _, err := xStatistic.Exec(sql, numForks, repoId) + return err +} + func UpdateRepoStat(repoStat *RepoStatistic) error { sql := "update repo_statistic set impact=?,completeness=?,liveness=?,project_health=?,team_health=?,growth=?,radar_total=? where repo_id=? and date=?" diff --git a/modules/setting/setting.go b/modules/setting/setting.go index eb0e41c90..738284c8e 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -544,6 +544,7 @@ var ( GrowthContributors float64 GrowthCommit float64 GrowthComments float64 + RecordBeginTime string }{} ) @@ -1324,6 +1325,7 @@ func SetRadarMapConfig() { RadarMap.GrowthContributors = sec.Key("growth_contributors").MustFloat64(0.2) RadarMap.GrowthCommit = sec.Key("growth_commit").MustFloat64(0.2) RadarMap.GrowthComments = sec.Key("growth_comments").MustFloat64(0.2) + RadarMap.RecordBeginTime = sec.Key("record_beigin_time").MustString("2021-11-05") } diff --git a/modules/storage/obs.go b/modules/storage/obs.go index bd73281d0..8e72c03c4 100755 --- a/modules/storage/obs.go +++ b/modules/storage/obs.go @@ -178,6 +178,7 @@ func GetObsListObject(jobName, parentDir string) ([]FileInfo, error) { input := &obs.ListObjectsInput{} input.Bucket = setting.Bucket input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/") + strPrefix := strings.Split(input.Prefix, "/") output, err := ObsCli.ListObjects(input) fileInfos := make([]FileInfo, 0) if err == nil { @@ -186,15 +187,29 @@ func GetObsListObject(jobName, parentDir string) ([]FileInfo, error) { var isDir bool var fileName,nextParentDir string if strings.HasSuffix(val.Key, "/") { + //dirs in next level dir + if len(str1) - len(strPrefix) > 2 { + continue + } fileName = str1[len(str1)-2] isDir = true - nextParentDir = fileName - if fileName == parentDir || (fileName + "/") == setting.OutPutPath { + if parentDir == "" { + nextParentDir = fileName + } else { + nextParentDir = parentDir + "/" + fileName + } + + if fileName == strPrefix[len(strPrefix)-1] || (fileName + "/") == setting.OutPutPath { continue } } else { + //files in next level dir + if len(str1) - len(strPrefix) > 1 { + continue + } fileName = str1[len(str1)-1] isDir = false + nextParentDir = parentDir } fileInfo := FileInfo{ diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7fa8c7a4f..a722ea671 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -755,6 +755,7 @@ unit_disabled = The site administrator has disabled this repository section. language_other = Other datasets = Datasets datasets.desc = Enable Dataset +cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc. debug=Debug stop=Stop @@ -785,7 +786,12 @@ cloudbrain_operate = Operate cloudbrain_status_createtime = Status/Createtime cloudbrain_status_runtime = Running Time - +record_begintime_get_err=Can not get the record begin time. +parameter_is_wrong=The input parameter is wrong. +total_count_get_error=Can not get the total page. +last_update_time_error=Can not get the last updated time. +get_repo_stat_error=Can not get the statistics of the repository. +get_repo_info_error=Can not get the information of the repository. modelarts.notebook=Debug Task modelarts.train_job=Train Task modelarts.train_job.new_debug= New Debug Task diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 81b4a8459..e89c3dcde 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -757,6 +757,7 @@ unit_disabled=站点管理员已禁用此项目单元。 language_other=其它 datasets=数据集 datasets.desc=数据集功能 +cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等 debug=调试 stop=停止 @@ -787,6 +788,12 @@ cloudbrain_status_createtime=状态/创建时间 cloudbrain_status_runtime = 运行时长 cloudbrain_jobname_err=只能以小写字母或数字开头且只包含小写字母、数字、_和-，不能以_结尾，最长36个字符。 +record_begintime_get_err=无法获取统计开始时间。 +parameter_is_wrong=输入参数错误，请检查输入参数。 +total_count_get_error=查询总页数失败。 +last_update_time_error=查询最新更新时间失败。 +get_repo_stat_error=查询当前仓库的统计信息失败。 +get_repo_info_error=查询当前仓库信息失败。 modelarts.notebook=调试任务 modelarts.train_job=训练任务 modelarts.train_job.new_debug=新建调试任务 diff --git a/public/img/git-logo.svg b/public/img/git-logo.svg new file mode 100644 index 000000000..70e6ab484 --- /dev/null +++ b/public/img/git-logo.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 9dd773c4d..8b068d612 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -523,6 +523,21 @@ func RegisterRoutes(m *macaron.Macaron) { Get(notify.GetThread). Patch(notify.ReadThread) }, reqToken()) + adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true}) + //Project board + m.Group("/projectboard", func() { + + m.Get("/restoreFork", adminReq, repo.RestoreForkNumber) + + m.Group("/project", func() { + m.Get("", adminReq, repo.GetAllProjectsPeriodStatistics) + m.Group("/:id", func() { + m.Get("", adminReq, repo.GetProjectLatestStatistics) + m.Get("/period", adminReq, repo.GetProjectPeriodStatistics) + + }) + }) + }) // Users m.Group("/users", func() { diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go new file mode 100644 index 000000000..e48bda50d --- /dev/null +++ b/routers/api/v1/repo/repo_dashbord.go @@ -0,0 +1,384 @@ +package repo + +import ( + "fmt" + "net/http" + "strconv" + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" +) + +const DEFAULT_PAGE_SIZE = 10 +const DATE_FORMAT = "2006-01-02" + +type ProjectsPeriodData struct { + RecordBeginTime string `json:"recordBeginTime"` + LastUpdatedTime string `json:"lastUpdatedTime"` + PageSize int `json:"pageSize"` + TotalPage int `json:"totalPage"` + PageRecords []*models.RepoStatistic `json:"pageRecords"` +} + +type UserInfo struct { + User string `json:"user"` + Mode int `json:"mode"` + PR int64 `json:"pr"` + Commit int `json:"commit"` +} + +type ProjectLatestData struct { + RecordBeginTime string `json:"recordBeginTime"` + LastUpdatedTime string `json:"lastUpdatedTime"` + CreatTime string `json:"creatTime"` + OpenI float64 `json:"openi"` + Comment int64 `json:"comment"` + View int64 `json:"view"` + Download int64 `json:"download"` + IssueClosedRatio float32 `json:"issueClosedRatio"` + Impact float64 `json:"impact"` + Completeness float64 `json:"completeness"` + Liveness float64 `json:"liveness"` + ProjectHealth float64 `json:"projectHealth"` + TeamHealth float64 `json:"teamHealth"` + Growth float64 `json:"growth"` + Description string `json:"description"` + Top10 []UserInfo `json:"top10"` +} + +func RestoreForkNumber(ctx *context.Context) { + repos, err := models.GetAllRepositories() + if err != nil { + log.Error("GetAllRepositories failed: %v", err.Error()) + return + } + for _, repo := range repos { + models.RestoreRepoStatFork(int64(repo.NumForks), repo.ID) + } + + ctx.JSON(http.StatusOK, struct{}{}) +} + +func GetAllProjectsPeriodStatistics(ctx *context.Context) { + + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime) + if err != nil { + log.Error("Parameter is wrong", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) + return + } + q := ctx.QueryTrim("q") + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + pageSize := ctx.QueryInt("pagesize") + if pageSize <= 0 { + pageSize = DEFAULT_PAGE_SIZE + } + orderBy := getOrderBy(ctx) + + latestUpdatedTime, latestDate, err := models.GetRepoStatLastUpdatedTime() + if err != nil { + log.Error("Can not query the last updated time.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) + return + } + + countSql := generateCountSql(beginTime, endTime, latestDate, q) + total, err := models.CountRepoStatByRawSql(countSql) + if err != nil { + log.Error("Can not query total count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + return + } + + projectsPeriodData := ProjectsPeriodData{ + RecordBeginTime: recordBeginTime.Format(DATE_FORMAT), + PageSize: pageSize, + TotalPage: getTotalPage(total, pageSize), + LastUpdatedTime: latestUpdatedTime, + PageRecords: models.GetRepoStatisticByRawSql(generatePageSql(beginTime, endTime, latestDate, q, orderBy, page, pageSize)), + } + + ctx.JSON(http.StatusOK, projectsPeriodData) + +} + +func GetProjectLatestStatistics(ctx *context.Context) { + repoId := ctx.Params(":id") + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + latestUpdatedTime, latestDate, err := models.GetRepoStatLastUpdatedTime(repoId) + repoIdInt, _ := strconv.ParseInt(repoId, 10, 64) + repoStat, err := models.GetRepoStatisticByDateAndRepoId(latestDate, repoIdInt) + if err != nil { + log.Error("Can not get the repo statistics "+repoId, err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.get_repo_stat_error")) + return + } + + repository, err := models.GetRepositoryByID(repoIdInt) + if err != nil { + log.Error("Can not get the repo info "+repoId, err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.get_repo_info_error")) + return + } + projectLatestData := ProjectLatestData{ + RecordBeginTime: recordBeginTime.Format(DATE_FORMAT), + CreatTime: time.Unix(int64(repository.CreatedUnix), 0).Format(DATE_FORMAT), + LastUpdatedTime: latestUpdatedTime, + OpenI: repoStat.RadarTotal, + Comment: repoStat.NumComments, + View: repoStat.NumVisits, + Download: repoStat.NumDownloads, + IssueClosedRatio: repoStat.IssueFixedRate, + Impact: repoStat.Impact, + Completeness: repoStat.Completeness, + Liveness: repoStat.Liveness, + ProjectHealth: repoStat.ProjectHealth, + TeamHealth: repoStat.TeamHealth, + Growth: repoStat.Growth, + Description: repository.Description, + } + + contributors, err := models.GetTop10Contributor(repository.RepoPath()) + if err != nil { + log.Error("can not get contributors", err) + } + users := make([]UserInfo, 0) + + for _, contributor := range contributors { + mode := repository.GetCollaboratorMode(contributor.UserId) + if mode == -1 { + if contributor.IsAdmin { + mode = int(models.AccessModeAdmin) + } + if contributor.UserId == repository.OwnerID { + mode = int(models.AccessModeOwner) + } + } + + pr := models.GetPullCountByUserAndRepoId(repoIdInt, contributor.UserId) + userInfo := UserInfo{ + User: contributor.Committer, + Commit: contributor.CommitCnt, + Mode: mode, + PR: pr, + } + users = append(users, userInfo) + + } + + projectLatestData.Top10 = users + + ctx.JSON(http.StatusOK, projectLatestData) + +} + +func GetProjectPeriodStatistics(ctx *context.Context) { + repoId := ctx.Params(":id") + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + + repoIdInt, _ := strconv.ParseInt(repoId, 10, 64) + + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime) + isOpenI := ctx.QueryBool("openi") + var repositorys []*models.RepoStatistic + if isOpenI { + repositorys = models.GetRepoStatisticByRawSql(generateRadarSql(beginTime, endTime, repoIdInt)) + } else { + repositorys = models.GetRepoStatisticByRawSql(generateTargetSql(beginTime, endTime, repoIdInt)) + } + ctx.JSON(http.StatusOK, repositorys) +} + +func generateRadarSql(beginTime time.Time, endTime time.Time, repoId int64) string { + sql := "SELECT date, impact, completeness, liveness, project_health, team_health, growth, radar_total FROM repo_statistic" + + " where repo_id=" + strconv.FormatInt(repoId, 10) + " and created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + return sql +} + +func generateTargetSql(beginTime time.Time, endTime time.Time, repoId int64) string { + sql := "SELECT date, num_visits,num_downloads,num_commits FROM repo_statistic" + + " where repo_id=" + strconv.FormatInt(repoId, 10) + " and created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + return sql +} + +func generateCountSql(beginTime time.Time, endTime time.Time, yesterday string, q string) string { + countSql := "SELECT count(*) FROM " + + "(SELECT repo_id FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," + + "(SELECT repo_id,name,is_private,radar_total from public.repo_statistic where date='" + yesterday + "') B" + + " where A.repo_id=B.repo_id" + if q != "" { + countSql = countSql + " and B.name like '%" + q + "%'" + } + return countSql +} + +func generatePageSql(beginTime time.Time, endTime time.Time, yesterday string, q string, orderBy string, page int, pageSize int) string { + countSql := "SELECT A.repo_id,name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " + + "(SELECT repo_id,sum(num_watches_added) as num_watches,sum(num_visits) as num_visits, sum(num_downloads_added) as num_downloads,sum(num_pulls_added) as num_pulls,sum(num_commits_added) as num_commits,sum(num_stars_added) as num_stars,sum(num_forks_added) num_forks,sum(num_issues_added) as num_issues,sum(num_closed_issues_added) as num_closed_issues,sum(num_contributor_added) as num_contributor " + + " FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," + + "(SELECT repo_id,name,is_private,radar_total from public.repo_statistic where date='" + yesterday + "') B" + + " where A.repo_id=B.repo_id" + if q != "" { + countSql = countSql + " and B.name like '%" + q + "%'" + } + countSql = countSql + " order by " + orderBy + " desc,A.repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize) + return countSql +} + +func getOrderBy(ctx *context.Context) string { + orderBy := "" + switch ctx.Query("sort") { + case "openi": + orderBy = "B.radar_total" + case "view": + orderBy = "A.num_visits" + case "download": + orderBy = "A.num_downloads" + case "pr": + orderBy = "A.num_pulls" + case "commit": + orderBy = "A.num_commits" + case "watch": + orderBy = "A.num_watches" + case "star": + orderBy = "A.num_stars" + case "fork": + orderBy = "A.num_forks" + case "issue": + orderBy = "A.num_issues" + case "issue_closed": + orderBy = "A.num_closed_issues" + case "contributor": + orderBy = "A.num_contributor" + default: + orderBy = "B.radar_total" + } + return orderBy +} + +func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, time.Time, error) { + queryType := ctx.QueryTrim("type") + now := time.Now() + recordBeginTimeTemp := recordBeginTime.AddDate(0, 0, 1) + + beginTimeStr := ctx.QueryTrim("beginTime") + endTimeStr := ctx.QueryTrim("endTime") + var beginTime time.Time + var endTime time.Time + + if queryType != "" { + + if queryType == "all" { + beginTime = recordBeginTimeTemp + endTime = now + } else if queryType == "yesterday" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_week" { + beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+1) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + } else if queryType == "current_month" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 2, 0, 0, 0, 0, now.Location()) + } else if queryType == "monthly" { + endTime = now + beginTime = now.AddDate(0, -1, 1) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_year" { + endTime = now + beginTime = time.Date(endTime.Year(), 1, 2, 0, 0, 0, 0, now.Location()) + + } else if queryType == "last_month" { + + lastMonthTime := now.AddDate(0, -1, 0) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 2, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + + } else { + return now, now, fmt.Errorf("The value of type parameter is wrong.") + + } + + } else { + if beginTimeStr == "" || endTimeStr == "" { + //如果查询类型和开始时间结束时间都未设置，按queryType=all处理 + beginTime = recordBeginTimeTemp + endTime = now + + } else { + + beginTime, err := time.Parse("2006-01-02", beginTimeStr) + if err != nil { + return now, now, err + } + + endTime, err := time.Parse("2006-01-02", endTimeStr) + if err != nil { + return now, now, err + } + + beginTime = beginTime.AddDate(0, 0, 1) + endTime = endTime.AddDate(0, 0, 1) + } + + } + + if beginTime.Before(recordBeginTimeTemp) { + beginTime = recordBeginTimeTemp + } + + return beginTime, endTime, nil + +} + +func getRecordBeginTime() (time.Time, error) { + + return time.Parse(DATE_FORMAT, setting.RadarMap.RecordBeginTime) +} + +func getTotalPage(total int64, pageSize int) int { + + another := 0 + if int(total)%pageSize != 0 { + another = 1 + } + return int(total)/pageSize + another + +} diff --git a/routers/home.go b/routers/home.go index 71ba5b6c5..dfdb030e4 100755 --- a/routers/home.go +++ b/routers/home.go @@ -146,7 +146,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { ctx.Data["SortType"] = "hot" orderBy = models.SearchOrderByHot } - + orderBy = orderBy + ",id" //todo:support other topics keyword := strings.Trim(ctx.Query("q"), " ") topic := strings.Trim(ctx.Query("topic"), " ") diff --git a/routers/org/members.go b/routers/org/members.go old mode 100644 new mode 100755 diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index 2de22a1ee..c1edb0fed 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -93,6 +93,7 @@ func RepoStatisticDaily(date string) { IsPrivate: repo.IsPrivate, NumWatches: int64(repo.NumWatches), NumStars: int64(repo.NumStars), + NumForks: int64(repo.NumForks), NumDownloads: repo.CloneCnt, NumComments: numComments, NumVisits: int64(numVisits), @@ -115,7 +116,7 @@ func RepoStatisticDaily(date string) { } dayBeforeDate := t.AddDate(0, 0, -1).Format("2006-01-02") - repoStatisticsBefore, err := models.GetRepoStatisticByDate(dayBeforeDate) + repoStatisticsBefore, err := models.GetRepoStatisticByDate(dayBeforeDate, repo.ID) if err != nil { log.Error("get data of day before the date failed ", err) diff --git a/routers/repo/view.go b/routers/repo/view.go old mode 100644 new mode 100755 index 9477b27dd..f85ab07cf --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -243,6 +243,11 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["ReadmeInList"] = true ctx.Data["ReadmeExist"] = true ctx.Data["FileIsSymlink"] = readmeFile.isSymlink + ctx.Data["ReadmeName"] = readmeFile.name + + if ctx.Repo.CanEnableEditor() { + ctx.Data["CanEditFile"] = true + } dataRc, err := readmeFile.blob.DataAsync() if err != nil { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index c1702ebe1..153a77e93 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -311,7 +311,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Head("/", func() string { return "" }) - m.Get("/", routers.Dashboard) + m.Get("/", routers.Home) m.Get("/dashboard", routers.Dashboard) m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { @@ -615,6 +615,11 @@ func RegisterRoutes(m *macaron.Macaron) { //reqRepoBlockChainWriter := context.RequireRepoWriter(models.UnitTypeBlockChain) // ***** START: Organization ***** + m.Group("/org", func() { + m.Group("/:org", func() { + m.Get("/members", org.Members) + }, context.OrgAssignment()) + }) m.Group("/org", func() { m.Group("", func() { m.Get("/create", org.Create) @@ -625,7 +630,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/dashboard", user.Dashboard) m.Get("/^:type(issues|pulls)$", user.Issues) m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones) - m.Get("/members", org.Members) + //m.Get("/members", org.Members) m.Post("/members/action/:action", org.MembersAction) m.Get("/teams", org.Teams) diff --git a/routers/user/auth.go b/routers/user/auth.go index 44c5ad97d..16af84b66 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -544,7 +544,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR if err := models.UpdateUserCols(u, "language"); err != nil { log.Error(fmt.Sprintf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language)) - return setting.AppSubURL + "/" + return setting.AppSubURL + "/dashboard" } } else { // Language setting of the user use the one previously set @@ -562,7 +562,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR u.SetLastLogin() if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { ctx.ServerError("UpdateUserCols", err) - return setting.AppSubURL + "/" + return setting.AppSubURL + "/dashboard" } if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 && !util.IsExternalURL(redirectTo) { @@ -574,9 +574,9 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR } if obeyRedirect { - ctx.Redirect(setting.AppSubURL + "/") + ctx.Redirect(setting.AppSubURL + "/dashboard") } - return setting.AppSubURL + "/" + return setting.AppSubURL + "/dashboard" } // SignInOAuth handles the OAuth2 login buttons diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 24389d122..110200894 100755 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -180,8 +180,8 @@ var _hmt = _hmt || []; (function() { var hm = document.createElement("script"); - hm.src = "https://hm.baidu.com/hm.js?7c4ef0a24be6109ab22e63c832ab21cf"; - var s = document.getElementsByTagName("script")[0]; + hm.src = "https://hm.baidu.com/hm.js?46149a0b61fdeddfe427ff4de63794ba"; + var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl index 69bf23f51..d1b2934ea 100644 --- a/templates/base/head_home.tmpl +++ b/templates/base/head_home.tmpl @@ -181,8 +181,8 @@ var _hmt = _hmt || []; (function() { var hm = document.createElement("script"); - hm.src = "https://hm.baidu.com/hm.js?7c4ef0a24be6109ab22e63c832ab21cf"; - var s = document.getElementsByTagName("script")[0]; + hm.src = "https://hm.baidu.com/hm.js?46149a0b61fdeddfe427ff4de63794ba"; + var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index c22cb9fa7..57df408c9 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -7,6 +7,14 @@ +
+
+ + + +
+ + {{if .IsSigned}} {{.i18n.Tr "index"}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl old mode 100644 new mode 100755 index a81e8ac17..ad5a8e02d --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -38,11 +38,12 @@

{{.i18n.Tr "org.people"}} - {{if .IsOrganizationMember}} -
- {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} -
- {{end}} +
+ {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} +
+ + +

{{$isMember := .IsOrganizationMember}} diff --git a/templates/org/navber.tmpl b/templates/org/navber.tmpl index 9ff92845e..7bb2ff69c 100755 --- a/templates/org/navber.tmpl +++ b/templates/org/navber.tmpl @@ -3,10 +3,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} @@ -23,10 +23,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} {{end}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 41f6be643..58da09e90 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -2,8 +2,18 @@
{{template "repo/header" .}}
-

{{.DateFrom}} - {{.DateUntil}} -
+
+
+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.activity"}}
+
+
+
+ {{.DateFrom}} - {{.DateUntil}} +
+
@@ -23,7 +33,7 @@
-

+
{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c290de552..6dc4d8ee5 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -92,16 +92,27 @@ {{if not .Repository.IsBeingCreated}}
{{if .Permission.CanRead $.UnitTypeCode}} - - {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} +
+ + {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} - {{end}} +
+ + {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} + + + {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + + + {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} + - {{if .Permission.CanRead $.UnitTypeDatasets}} - - {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} - +
+
+ {{end}} + + {{if .Permission.CanRead $.UnitTypeIssues}} @@ -109,11 +120,11 @@ {{end}} - {{if .Permission.CanRead $.UnitTypeExternalTracker}} + {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} @@ -121,35 +132,22 @@ {{end}} - {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} - - {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} {{.NumReleases}} + {{if .Permission.CanRead $.UnitTypeDatasets}} + + {{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}} {{end}} - - {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - - {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} - - {{end}} - - {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} - - {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} - - {{end}} - {{if .Permission.CanRead $.UnitTypeCloudBrain}} - {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} + {{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}} {{end}} - {{if .IsSigned}} + {{template "custom/extra_tabs" .}} @@ -243,4 +241,9 @@ window.location.href = repolink + "/datasets?type=" + checked_radio }) }) + $('.question.circle.icon').hover(function(){ + $(this).popup('show') + $('.ui.popup.mini.top.center').css({"border-color":'rgba(50, 145, 248, 100)',"color":"rgba(3, 102, 214, 100)","border-radius":"5px"}) + }); + \ No newline at end of file diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index d0b160a1c..59f076f02 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -4,7 +4,11 @@
{{template "base/alert" .}}

- {{.i18n.Tr "repo.release.releases"}} +
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.releases"}}
+
{{if .CanCreateRelease}}
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl old mode 100644 new mode 100755 index 1216b5f40..a0cae31f3 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -34,6 +34,21 @@
{{end}}

+ + {{if .ReadmeInList}} +
+
+ {{if .Repository.CanEnableEditor}} + {{if .CanEditFile}} + {{svg "octicon-pencil" 16}} + {{else}} + {{svg "octicon-pencil" 16}} + {{end}} + {{end}} +
+
+ {{end}} + {{if not .ReadmeInList}}
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index d8de0fcb7..78b1ddafc 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -2,6 +2,13 @@
{{template "repo/header" .}}
+

+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.wiki"}}
+
+

{{svg "octicon-book" 32}}

{{.i18n.Tr "repo.wiki.welcome"}}

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index e9d02d508..ea132e3ac 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -3,6 +3,14 @@ {{template "repo/header" .}} {{ $title := .title}}
+

+
+ {{.i18n.Tr "repo.code"}} +
/
+
{{.i18n.Tr "repo.wiki"}}
+
+

+
@@ -28,7 +36,7 @@
-
+
{{if not $.DisableHTTP}}