Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Antoine GIRARD
2015-02-20 01:19:49 +01:00
parent eb3c522122
commit 75ef82d18a
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/gitbucket/core/account/newrepo.scala.html
View File

@@ -31,7 +31,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
<fieldset class="margin"> <fieldset class="margin">
<label class="radio"> <label class="radio">
<input type="radio" name="isPrivate" value="false" @if(isCreateRepoOptionPublic){checked}> <input type="radio" name="isPrivate" value="false" @if(isCreateRepoOptionPublic){checked}>
<span class="strong"><img src="@assets/common/images/repo_public.png"/>&nbsp;</i>&nbsp;Public</span><br> <span class="strong"><i class="icon-repo"></i>&nbsp;</i>&nbsp;Public</span><br>
<div> <div>
<span>All users and guests can read this repository.</span> <span>All users and guests can read this repository.</span>
</div> </div>
@@ -40,7 +40,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
<fieldset> <fieldset>
<label class="radio"> <label class="radio">
<input type="radio" name="isPrivate" value="true" @if(!isCreateRepoOptionPublic){checked}> <input type="radio" name="isPrivate" value="true" @if(!isCreateRepoOptionPublic){checked}>
<span class="strong"><img src="@assets/common/images/repo_private.png"/>&nbsp;</i>&nbsp;Private</span><br> <span class="strong"><i class="icon-lock"></i>&nbsp;</i>&nbsp;Private</span><br>
<div> <div>
<span>Only collaborators can read this repository.</span> <span>Only collaborators can read this repository.</span>
</div> </div>

7
src/main/twirl/gitbucket/core/helper/activities.scala.html
View File

@@ -37,12 +37,12 @@
}} }}
</div> </div>
} }
case "create_wiki" => customActivity(activity, "activity-wiki.png"){ case "create_wiki" => customActivity(activity, "book"){
<div class="small activity-message"> <div class="small activity-message">
Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>. Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
</div> </div>
} }
case "edit_wiki" => customActivity(activity, "activity-wiki.png"){ case "edit_wiki" => customActivity(activity, "book"){
activity.additionalInfo.get.split(":") match { activity.additionalInfo.get.split(":") match {
case Array(pageName, commitId) => case Array(pageName, commitId) =>
<div class="small activity-message"> <div class="small activity-message">
@@ -61,7 +61,7 @@
} }
@detailActivity(activity: gitbucket.core.model.Activity, image: String) = { @detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
<div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div> <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
<div class="activity-content"> <div class="activity-content">
<div class="muted small">@helper.html.datetimeago(activity.activityDate)</div> <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
<div class="strong"> <div class="strong">
@@ -74,7 +74,6 @@
</div> </div>
} }
@customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = { @customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
<div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div> <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
<div class="activity-content"> <div class="activity-content">

2
src/main/twirl/gitbucket/core/issues/create.scala.html
View File

@@ -41,7 +41,7 @@
<div class="small" style="padding-left: 20px;"> <div class="small" style="padding-left: 20px;">
@milestone.dueDate.map { dueDate => @milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){ @if(isPast(dueDate)){
<img src="@assets/common/images/alert.png"/><span class="milestone-alert">Due by @date(dueDate)</span> <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
} else { } else {
<span class="muted">Due by @date(dueDate)</span> <span class="muted">Due by @date(dueDate)</span>
} }

2
src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
View File

@@ -42,7 +42,7 @@
<div class="small" style="padding-left: 20px;"> <div class="small" style="padding-left: 20px;">
@milestone.dueDate.map { dueDate => @milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){ @if(isPast(dueDate)){
<img src="@assets/common/images/alert.png"/><span class="milestone-alert">Due by @date(dueDate)</span> <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
} else { } else {
<span class="muted">Due by @date(dueDate)</span> <span class="muted">Due by @date(dueDate)</span>
} }

2
src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
View File

@@ -38,7 +38,7 @@
} else { } else {
@milestone.dueDate.map { dueDate => @milestone.dueDate.map { dueDate =>
@if(isPast(dueDate)){ @if(isPast(dueDate)){
<img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due by @date(dueDate)</span> <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="muted milestone-alert">Due by @date(dueDate)</span>
} else { } else {
<span class="muted">Due by @date(dueDate)</span> <span class="muted">Due by @date(dueDate)</span>
} }

4
src/main/twirl/gitbucket/core/repo/commit.scala.html
View File

@@ -25,7 +25,7 @@
<div class="small" style="font-weight: normal;"> <div class="small" style="font-weight: normal;">
@if(branches.nonEmpty){ @if(branches.nonEmpty){
<span class="muted"> <span class="muted">
<img src="@assets/common/images/branch.png"/> <i class="octicon octicon-git-branch"></i>
@branches.zipWithIndex.map { case (branch, i) => @branches.zipWithIndex.map { case (branch, i) =>
<a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a> <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
} }
@@ -33,7 +33,7 @@
} }
@if(tags.nonEmpty){ @if(tags.nonEmpty){
<span class="muted"> <span class="muted">
<img src="@assets/common/images/tag.png"/> <i class="octicon octicon-tag"></i>
@tags.zipWithIndex.map { case (tag, i) => @tags.zipWithIndex.map { case (tag, i) =>
<a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a> <a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
} }