diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/.VERSION | 2 | ||||
-rw-r--r-- | templates/base/head.tmpl | 5 | ||||
-rw-r--r-- | templates/org/home.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/home.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/comment_tab.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/nav.tmpl | 67 | ||||
-rw-r--r-- | templates/repo/sidebar.tmpl | 16 | ||||
-rw-r--r-- | templates/repo/wiki/new.tmpl | 35 | ||||
-rw-r--r-- | templates/repo/wiki/pages.tmpl | 28 | ||||
-rw-r--r-- | templates/repo/wiki/start.tmpl | 16 | ||||
-rw-r--r-- | templates/repo/wiki/view.tmpl | 73 | ||||
-rw-r--r-- | templates/status/401.tmpl | 5 | ||||
-rw-r--r-- | templates/status/403.tmpl | 5 |
13 files changed, 174 insertions, 88 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index e15b0b953e..2fb17edbd9 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.22.1125 Beta
\ No newline at end of file +0.7.24.1130 Beta
\ No newline at end of file diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index d5513280a0..b1d4283614 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -19,6 +19,11 @@ <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <link rel="stylesheet" href="{{AppSubUrl}}/css/font-awesome-4.4.0.min.css"> + {{if .RequireSimpleMDE}} + <link rel="stylesheet" href="{{AppSubUrl}}/css/simplemde-1.8.1.min.css"> + <script src="{{AppSubUrl}}/js/libs/simplemde-1.8.1.min.js"></script> + {{end}} + <!-- Stylesheet --> <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic-2.1.6.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.css?v={{MD5 AppVer}}"> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index f1e19e30dc..fdd494b19b 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -24,7 +24,6 @@ <div class="ui container"> <div class="ui grid"> - {{$isMember := .Org.IsOrgMember $.SignedUser.Id}} <div class="ui eleven wide column"> {{if .IsOrganizationOwner}} <div class="text right"> @@ -38,13 +37,14 @@ <div class="ui five wide column"> <h4 class="ui top attached header"> <strong>{{.i18n.Tr "org.people"}}</strong> - {{if $isMember}} + {{if .IsOrganizationMember}} <div class="ui right"> <a class="text grey" href="{{.OrgLink}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a> </div> {{end}} </h4> <div class="ui attached segment members"> + {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.Id)}} <a href="{{.HomeLink}}" title="{{.Name}}"><img class="ui avatar" src="{{.AvatarLink}}"></a> @@ -57,7 +57,7 @@ </div> {{end}} - {{if $isMember}} + {{if .IsOrganizationMember}} <div class="ui top attached header"> <strong>{{.i18n.Tr "org.teams"}}</strong> <div class="ui right"> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index ab82c8423c..260f637532 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -11,7 +11,7 @@ </p> </div> <div class="ui six wide column"> - <div class="ui action small clone input"> + <div class="ui action small input" id="clone-panel"> {{if not $.DisableSSH}} <button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}"> SSH diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index d2880febd0..a3f80edfb5 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -1,7 +1,7 @@ <div class="field"> <div class="ui top attached tabular menu" data-write="write" data-preview="preview"> <a class="active item" data-tab="write">{{.i18n.Tr "repo.release.write"}}</a> - <a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a> + <a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "repo.release.preview"}}</a> </div> <div class="ui bottom attached active tab segment" data-tab="write"> <textarea id="content" name="content" tabindex="4"></textarea> diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl deleted file mode 100644 index dfcfd74542..0000000000 --- a/templates/repo/nav.tmpl +++ /dev/null @@ -1,67 +0,0 @@ -<div id="body-nav" class="repo-nav"> - <div class="container"> - <div class="row"> - <div class="col-md-7"> - <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}">{{.Repository.Name}}</a> {{if .Repository.IsPrivate}}<span class="label label-default">Private</span>{{else if .Repository.IsMirror}}<span class="label label-default">Mirror</span>{{end}}</h3> - <p class="desc">{{.Repository.DescriptionHtml}}{{if .Repository.Website}} <a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p> - </div> - <div class="col-md-5 actions text-right clone-group-btn"> - {{if not .IsBareRepo}} - <div class="btn-group" id="repo-clone"> - <a class="btn btn-default" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.zip"><i class="fa fa-download fa-lg fa-m"></i></a> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> - <span class="caret"></span> - </button> - <div class="dropdown-menu clone-group-btn dropdown-menu-right no-propagation"> - <div class="input-group"> - <span class="input-group-btn"> - <button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button> - <button class="btn btn-default" data-link="{{.CloneLink.HTTPS}}" type="button">HTTPS</button> - </span> - <input type="text" class="form-control clone-group-url" value="" readonly id="repo-clone-ipt"/> - <span class="input-group-btn"> - <button class="btn btn-default" type="button" data-toggle="tooltip" title="copy to clipboard" data-placement="top" data-init="copy" data-copy-val="val" data-copy-from="#repo-clone-ipt"><i class="fa fa-copy"></i></button> - </span> - </div> - <p class="help-block text-center">Need help cloning? Visit <a target="_blank" href="https://help.github.com/articles/fork-a-repo">Help</a>!</p> - <hr/> - <div class="clone-zip text-center"> - <a class="btn btn-success btn-lg" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.zip" rel="nofollow"><i class="fa fa-suitcase"></i>Download ZIP</a> - <a class="btn btn-success btn-lg" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.tar.gz" rel="nofollow"><i class="fa fa-suitcase"></i>Download TAR.GZ</a> - </div> - </div> - </div> - {{if .IsSigned}} - <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch"> - {{if .IsRepositoryWatching}} - <button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button> - {{else}} - <button type="button" class="btn btn-default"><i class="fa fa-eye-slash fa-lg fa-m"></i></button> - {{end}} - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> - <span class="caret"></span> - </button> - <div class="dropdown-menu dropdown-menu-right"> - <div class="dropdown-item text-left to-unwatch"> - <h4 role="presentation" class="dropdown-header {{if not .IsRepositoryWatching}}text-primary{{end}}">Not Watching</h4> - <p class="description">You only receive notifications for conversations in which you participate or are @mentioned.</p> - <p class="divider"></p> - </div> - <div class="dropdown-item text-left to-watch"> - <h4 role="presentation" class="dropdown-header {{if .IsRepositoryWatching}}text-primary{{end}}">Watching</h4> - <p class="description">You receive notifications for all conversations in this repository.</p> - </div> - </div> - </div> - {{end}} - <!-- <div class="btn-group"> - <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i> {{.Repository.NumStars}}</button> - </div> --> - {{end}} - <!-- <div class="btn-group"> - <a type="button" {{if not .IsRepositoryOwner}}href="{{AppSubUrl}}/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i> {{.Repository.NumForks}}</a> - </div> --> - </div> - </div> - </div> -</div> diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index ca38627bcf..912b50570b 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -1,16 +1,22 @@ {{if not .IsBareRepo}} -<div class="ui {{if .IsRepositoryAdmin}}five{{else}}four{{end}} item menu"> +<div class="ui secondary pointing menu navbar"> + <a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}"> + <i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}} + </a> <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues"> - <i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui blue label">{{.Repository.NumOpenIssues}}</span> + <i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui blue small label">{{.Repository.NumOpenIssues}}</span> </a> <a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls"> - <i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui blue label">{{.Repository.NumOpenPulls}}</span> + <i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui blue small label">{{.Repository.NumOpenPulls}}</span> </a> <a class="{{if .PageIsCommits}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}"> - <i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui blue label">{{.CommitsCount}}</span> + <i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui blue small label">{{.CommitsCount}}</span> </a> <a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases"> - <i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui blue label">{{.Repository.NumTags}}</span> + <i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui blue small label">{{.Repository.NumTags}}</span> + </a> + <a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki"> + <i class="icon octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}} </a> {{if .IsRepositoryAdmin}} <a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings"> diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl new file mode 100644 index 0000000000..6a2ce43a58 --- /dev/null +++ b/templates/repo/wiki/new.tmpl @@ -0,0 +1,35 @@ +{{template "base/head" .}} +<div class="repository wiki new"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "repo/sidebar" .}} + {{template "base/alert" .}} + <div class="ui header"> + {{.i18n.Tr "repo.wiki.new_page"}} + {{if .PageIsWikiEdit}} + <div class="ui right"> + <a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a> + </div> + {{end}} + </div> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <input type="hidden" name="old_title" value="{{.old_title}}"> + <div class="field {{if .Err_Title}}error{{end}}"> + <input name="title" value="{{.title}}" autofocus required> + </div> + <div class="field"> + <textarea id="edit-area" name="content" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{if .PageIsWikiEdit}}{{.content}}{{else}}{{.i18n.Tr "repo.wiki.welcome"}}{{end}}</textarea required> + </div> + <div class="field"> + <input name="message" placeholder="{{.i18n.Tr "repo.wiki.default_commit_message"}}"> + </div> + <div class="text right"> + <button class="ui green button"> + {{.i18n.Tr "repo.wiki.save_page"}} + </button> + </div> + </form> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl new file mode 100644 index 0000000000..f99f6a4ecf --- /dev/null +++ b/templates/repo/wiki/pages.tmpl @@ -0,0 +1,28 @@ +{{template "base/head" .}} +<div class="repository wiki pages"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "repo/sidebar" .}} + <div class="ui header"> + {{.i18n.Tr "repo.wiki.pages"}} + <div class="ui right"> + <a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a> + </div> + </div> + <table class="ui table"> + <tbody> + {{range .Pages}} + <tr> + <td> + <i class="icon octicon octicon-file-text"></i> + <a href="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name}}</a> + </td> + {{$timeSince := TimeSince .Updated $.Lang}} + <td class="text right grey">{{$.i18n.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td> + </tr> + {{end}} + </tbody> + </table> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl new file mode 100644 index 0000000000..757ab9bce0 --- /dev/null +++ b/templates/repo/wiki/start.tmpl @@ -0,0 +1,16 @@ +{{template "base/head" .}} +<div class="repository wiki start"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "repo/sidebar" .}} + <div class="ui center segment"> + <span class="mega-octicon octicon-book"></span> + <h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2> + <p>{{.i18n.Tr "repo.wiki.welcome_desc"}}</p> + {{if .IsSigned}} + <a class="ui green button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.create_first_page"}}</a> + {{end}} + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl new file mode 100644 index 0000000000..fe8b5b3b36 --- /dev/null +++ b/templates/repo/wiki/view.tmpl @@ -0,0 +1,73 @@ +{{template "base/head" .}} +<div class="repository wiki view"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "repo/sidebar" .}} + <div class="ui grid"> + <div class="ui ten wide column"> + <div class="choose page"> + <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> + <div class="ui basic small button"> + <span class="text"> + {{.i18n.Tr "repo.wiki.page"}}: + <strong>{{.title}}</strong> + </span> + <i class="dropdown icon"></i> + </div> + <div class="menu"> + <div class="ui icon search input"> + <i class="filter icon"></i> + <input name="search" placeholder="{{.i18n.Tr "repo.wiki.filter_page"}}..."> + </div> + <div class="scrolling menu" {{if .IsTag}}style="display: none"{{end}}> + {{range .Pages}} + <div class="item {{if eq $.Title .Name}}selected{{end}}" data-url="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name}}</div> + {{end}} + </div> + </div> + </div> + </div> + </div> + <div class="ui six wide column"> + <div class="ui action small input" id="clone-panel"> + {{if not $.DisableSSH}} + <button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.WikiCloneLink.SSH}}"> + SSH + </button> + {{end}} + <button class="ui {{if $.DisableSSH}}blue{{end}} basic clone button" id="repo-clone-https" data-link="{{.WikiCloneLink.HTTPS}}"> + {{if UseHTTPS}}HTTPS{{else}}HTTP{{end}} + </button> + <input id="repo-clone-url" value="{{if $.DisableSSH}}{{$.WikiCloneLink.HTTPS}}{{else}}{{$.WikiCloneLink.SSH}}{{end}}" readonly> + <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> + <i class="octicon octicon-clippy"></i> + </button> + <div class="ui basic jump dropdown icon button"> + <i class="download icon"></i> + <div class="menu"> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip"><i class="icon octicon octicon-file-zip"></i> ZIP</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz"><i class="icon octicon octicon-file-zip"></i> TAR.GZ</a> + </div> + </div> + </div> + </div> + </div> + <div class="ui dividing header"> + {{.title}} + {{if .IsRepositoryPusher}} + <div class="ui right"> + <a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a> + <a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a> + </div> + {{end}} + <div class="ui sub header"> + {{$timeSince := TimeSince .Author.When $.Lang}} + {{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} + </div> + </div> + <div class="ui segment markdown"> + {{.content | Str2html}} + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/status/401.tmpl b/templates/status/401.tmpl deleted file mode 100644 index f00101fd3c..0000000000 --- a/templates/status/401.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "base/head" .}} -<div class="ui container center"> - 401 Unauthorized -</div> -{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/status/403.tmpl b/templates/status/403.tmpl deleted file mode 100644 index 5c413a2974..0000000000 --- a/templates/status/403.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "base/head" .}} -<div class="ui container center"> - 403 Forbidden -</div> -{{template "base/footer" .}}
\ No newline at end of file |