core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gogits/gogs 

Conflicts:
	public/ng/less/gogs/repository.less
	templates/repo/home.tmpl
This commit is contained in:
Unknwon 2014-09-28 01:44:09 -04:00
parent 49193bebd2 7d48f811f1
commit e3b78c47e2
11 changed files with 102 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/web.go
View File

@ -351,6 +351,7 @@ func runWeb(*cli.Context) {
r.Get("/pulls", repo.Pulls) r.Get("/pulls", repo.Pulls)
r.Get("/branches", repo.Branches) r.Get("/branches", repo.Branches)
r.Get("/archive/*", repo.Download) r.Get("/archive/*", repo.Download)
r.Get("/issues2/",repo.Issues2)
}, ignSignIn, middleware.RepoAssignment(true)) }, ignSignIn, middleware.RepoAssignment(true))
m.Group("/:username/:reponame", func(r *macaron.Router) { m.Group("/:username/:reponame", func(r *macaron.Router) {

24
public/ng/css/gogs.css
View File

@ -709,6 +709,7 @@ ol.linenums {
#dashboard-header { #dashboard-header {
border-bottom: 1px solid #d6d6d6; border-bottom: 1px solid #d6d6d6;
height: 69px; height: 69px;
background-color: #FFF;
} }
#dashboard-header > .menu-line > li { #dashboard-header > .menu-line > li {
padding: 12px 6px; padding: 12px 6px;
@ -824,6 +825,11 @@ ol.linenums {
#dashboard-my-repo .repo-contrib-header { #dashboard-my-repo .repo-contrib-header {
border-top: 1px solid #d6d6d6; border-top: 1px solid #d6d6d6;
} }
#dashboard-my-mirror .panel-header,
#dashboard-my-org .panel-header,
#dashboard-my-repo .panel-header {
font-size: 14px;
}
#dashboard-my-repo .panel-header .octicon { #dashboard-my-repo .panel-header .octicon {
margin-right: 6px; margin-right: 6px;
font-size: 12px; font-size: 12px;
@ -1053,6 +1059,10 @@ The register and sign-in page style
#repo-content { #repo-content {
padding: 18px 0; padding: 18px 0;
} }
.repo-wide-wrapper {
padding: 18px 0;
position: relative;
}
#repo-clone-url { #repo-clone-url {
border-right: none; border-right: none;
width: 190px; width: 190px;
@ -1077,6 +1087,9 @@ The register and sign-in page style
#repo-desc { #repo-desc {
font-size: 1.2em; font-size: 1.2em;
} }
#repo-desc .no-description {
color: #999;
}
#repo-sidebar-nav .label { #repo-sidebar-nav .label {
font-size: 12px; font-size: 12px;
line-height: 1.4em; line-height: 1.4em;
@ -1244,7 +1257,8 @@ The register and sign-in page style
font-weight: normal; font-weight: normal;
color: #888; color: #888;
} }
#repo-readme { #repo-readme,
#repo-read-file {
margin-bottom: 80px; margin-bottom: 80px;
} }
#repo-bare-start { #repo-bare-start {
@ -1454,6 +1468,10 @@ The register and sign-in page style
#commits-list { #commits-list {
padding-top: 20px; padding-top: 20px;
} }
#commits-list h4 {
line-height: 30px;
margin-bottom: 0;
}
.commit-list th { .commit-list th {
background-color: #FFF; background-color: #FFF;
line-height: 28px !important; line-height: 28px !important;
@ -1639,10 +1657,6 @@ The register and sign-in page style
#user-ssh-add-form .field { #user-ssh-add-form .field {
margin-bottom: 24px; margin-bottom: 24px;
} }
.repo-issue-wrapper {
padding: 18px 0;
position: relative;
}
.pr-main { .pr-main {
margin-right: 100px; margin-right: 100px;
} }

4
public/ng/less/gogs/dashboard.less
View File

@ -12,6 +12,7 @@
#dashboard-header { #dashboard-header {
border-bottom: 1px solid @dashboardHeaderBorderColor; border-bottom: 1px solid @dashboardHeaderBorderColor;
height: 69px; height: 69px;
background-color: #FFF;
> .menu-line { > .menu-line {
> li { > li {
padding: 12px 6px; padding: 12px 6px;
@ -125,6 +126,9 @@
.repo-contrib-header { .repo-contrib-header {
border-top: 1px solid #d6d6d6; border-top: 1px solid #d6d6d6;
} }
.panel-header{
font-size: 14px;
}
} }
#dashboard-my-repo { #dashboard-my-repo {
.panel-header { .panel-header {

11
public/ng/less/gogs/issue.less
View File

@ -1,23 +1,16 @@
@import "../ui/var"; @import "../ui/var";
.repo-issue-wrapper {
padding: 18px 0;
position: relative;
}
// pull request main content // pull request main content
.pr-main { .pr-main {
margin-right: 100px; margin-right: 100px;
} }
// right bar in pull request page // right bar in pull request page
.pr-sidebar { .pr-sidebar {
border-left: 1px solid #DDD; border-left: 1px solid #DDD;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
right:0; right: 0;
top:12px; top: 12px;
} }
.pr-title { .pr-title {
.pr-num { .pr-num {
font-weight: normal; font-weight: normal;

110
public/ng/less/gogs/repository.less
View File

@ -6,12 +6,12 @@
/* repository main */ /* repository main */
#repo-wrapper { #repo-wrapper {
padding-bottom: 100px; padding-bottom: 100px;
} }
#repo-header { #repo-header {
height: 69px; height: 69px;
border-bottom: 1px solid@repoHeaderBorderColor; border-bottom: 1px solid@repoHeaderBorderColor;
background-color: @repoHeaderBgColor; background-color: @repoHeaderBgColor;
} }
#repo-header-name { #repo-header-name {
line-height: 66px; line-height: 66px;
@ -91,6 +91,10 @@
#repo-content { #repo-content {
padding: 18px 0; padding: 18px 0;
} }
.repo-wide-wrapper {
padding: 18px 0;
position: relative;
}
#repo-clone-url { #repo-clone-url {
border-right: none; border-right: none;
width: 190px; width: 190px;
@ -114,6 +118,9 @@
} }
#repo-desc { #repo-desc {
font-size: 1.2em; font-size: 1.2em;
.no-description{
color: #999;
}
} }
#repo-sidebar-nav { #repo-sidebar-nav {
.label { .label {
@ -136,14 +143,14 @@
padding-left: 12px; padding-left: 12px;
width: 24px; width: 24px;
text-align: center; text-align: center;
> i.octicon{ > i.octicon {
font-size: 21px; font-size: 21px;
} }
} }
.num{ .num {
position: absolute; position: absolute;
font-size: 12px; font-size: 12px;
top:0; top: 0;
left: 36px; left: 36px;
padding: 0 2px; padding: 0 2px;
min-width: 16px; min-width: 16px;
@ -197,34 +204,34 @@
box-sizing: border-box; box-sizing: border-box;
} }
#repo-branch-tag { #repo-branch-tag {
.tab-nav { .tab-nav {
border-bottom: 1px solid #EAEAEA; border-bottom: 1px solid #EAEAEA;
a { a {
padding: .3em .8em; padding: .3em .8em;
}
.js-tab-nav-show {
background-color: #EEE;
font-weight: bold;
}
} }
.switching-list { .js-tab-nav-show {
max-height: 300px; background-color: #EEE;
overflow-y: auto; font-weight: bold;
} }
}
.switching-list {
max-height: 300px;
overflow-y: auto;
}
} }
#repo-branch-list, #repo-branch-list,
#repo-tag-list { #repo-tag-list {
li { li {
i { i {
margin-right: 12px; margin-right: 12px;
opacity: 0; opacity: 0;
}
} }
li.checked { }
i { li.checked {
opacity: 1; i {
} opacity: 1;
} }
}
} }
#repo-bread { #repo-bread {
.bread { .bread {
@ -301,7 +308,8 @@
} }
} }
} }
#repo-readme { #repo-readme,
#repo-read-file {
margin-bottom: 80px; margin-bottom: 80px;
} }
#repo-bare-start { #repo-bare-start {
@ -494,29 +502,29 @@
list-style: none; list-style: none;
} }
#commits-list { #commits-list {
padding-top: 20px; padding-top: 20px;
h4{
line-height: 30px;
margin-bottom: 0;
}
} }
.commit-list { .commit-list {
th { th {
background-color: #FFF; background-color: #FFF;
line-height: 28px !important; line-height: 28px !important;
}
.date {
width: 120px;
}
.author {
padding-left: 20px;
min-width: 180px;
img {
margin-top: -4px;
} }
.date { }
width: 120px; .sha a {
} font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
.author { font-size: 14px;
padding-left: 20px; }
min-width: 180px;
img {
margin-top: -4px;
}
}
.sha a {
font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
font-size: 14px;
}
}
.no-desc {
color: #888;
font-style: italic;
} }

6
routers/repo/issue.go
View File

@ -1119,3 +1119,9 @@ func IssueGetAttachment(ctx *middleware.Context) {
// We must put the name in " manually. // We must put the name in " manually.
ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"") ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"")
} }
// testing route handler for new issue ui page
// todo : move to Issue() function
func Issues2(ctx *middleware.Context){
ctx.HTML(200,"repo/issue2/list")
}

2
templates/repo/home.tmpl
View File

@ -3,7 +3,7 @@
<div id="repo-wrapper"> <div id="repo-wrapper">
{{template "repo/header" .}} {{template "repo/header" .}}
<div id="repo-content" class="clear container"> <div id="repo-content" class="clear container">
<div id="repo-main" class="left grid-4-5"> <div id="repo-main" class="left grid-5-6">
<p id="repo-desc"> <p id="repo-desc">
{{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-desc">{{.i18n.Tr "repo.no_desc"}}</span>{{end}} {{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-desc">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>

6
templates/repo/issue2/list.tmpl Normal file
View File

@ -0,0 +1,6 @@
{{template "ng/base/head" .}}
{{template "ng/base/header" .}}
<div id="repo-wrapper">
{{template "repo/header" .}}
</div>
{{template "ng/base/footer" .}}

2
templates/repo/pulls.tmpl
View File

@ -2,7 +2,7 @@
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="repo-wrapper"> <div id="repo-wrapper">
{{template "repo/header" .}} {{template "repo/header" .}}
<div class="clear container repo-issue-wrapper repo-pr"> <div class="clear container repo-wide-wrapper repo-pr">
<div class="pr-main"> <div class="pr-main">
<div class="pr-title clear"> <div class="pr-title clear">
<h2 class="pr-title grid-5-6 left">Fix: Repo Name can not be converted to lower in some cases <span class="pr-num">#256</span></h2> <h2 class="pr-title grid-5-6 left">Fix: Repo Name can not be converted to lower in some cases <span class="pr-num">#256</span></h2>

2
templates/repo/sidebar.tmpl
View File

@ -1,4 +1,4 @@
<div id="repo-sidebar" class="right grid-1-5"> <div id="repo-sidebar" class="right grid-1-6">
<ul class="menu menu-vertical" id="repo-sidebar-nav"> <ul class="menu menu-vertical" id="repo-sidebar-nav">
<li> <li>
<a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "repo.issues"}}<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a> <a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "repo.issues"}}<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a>

4
templates/repo/view_file.tmpl
View File

@ -1,4 +1,4 @@
<div class="panel panel-radius" id="repo-readme"> <div class="panel panel-radius" id="{{if .ReadmeExist}}repo-readme{{else}}repo-read-file{{end}}">
<p class="panel-header"> <p class="panel-header">
{{if .ReadmeExist}} {{if .ReadmeExist}}
<i class="icon fa fa-book fa-lg"></i> <i class="icon fa fa-book fa-lg"></i>
@ -12,7 +12,7 @@
<strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span> <strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span>
{{end}} {{end}}
</p> </p>
<div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view"> <div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view" id="repo-code-view">
{{if .ReadmeExist}} {{if .ReadmeExist}}
{{if .FileContent}}{{.FileContent | Str2html}}{{end}} {{if .FileContent}}{{.FileContent | Str2html}}{{end}}
{{else if not .IsFileText}} {{else if not .IsFileText}}