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

Change import to resolve resolving error in IntelliJ

Browse Source
This commit is contained in:
Naoki Takezoe
2016-07-09 14:22:06 +09:00
parent 0d342a6863
commit 4b5f22144e
6 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
@(title: String)(implicit context: gitbucket.core.controller.Context) @(title: String)(implicit context: gitbucket.core.controller.Context)
@main("Error"){ @gitbucket.core.html.main("Error"){
<h1>@title</h1> <h1>@title</h1>
} }

15
src/main/twirl/gitbucket/core/index.scala.html
View File

@@ -1,22 +1,21 @@
@(activities: List[gitbucket.core.model.Activity], @(activities: List[gitbucket.core.model.Activity],
recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo], recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context) userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
@import context._ @import gitbucket.core.view.helpers
@import gitbucket.core.view.helpers._ @gitbucket.core.html.main("GitBucket"){
@main("GitBucket"){ @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
@dashboard.html.sidebar(recentRepositories, userRepositories){ @context.settings.information.map { information =>
@settings.information.map { information =>
<div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;"> <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
@Html(information) @Html(information)
</div> </div>
} }
@dashboard.html.tab() @gitbucket.core.dashboard.html.tab()
<div class="container"> <div class="container">
<div class="pull-right"> <div class="pull-right">
<a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a> <a href="@context.path/activities.atom"><img src="@helpers.assets/common/images/feed.png" alt="activities"></a>
</div> </div>
@helper.html.activities(activities) @gitbucket.core.helper.html.activities(activities)
</div> </div>
} }
} }

93
src/main/twirl/gitbucket/core/main.scala.html
View File

@@ -1,57 +1,56 @@
@(title: String, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: gitbucket.core.controller.Context) @(title: String, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.plugin.PluginRegistry @import gitbucket.core.plugin.PluginRegistry
@import context._ @import gitbucket.core.view.helpers
@import gitbucket.core.view.helpers._
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>@title</title> <title>@title</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="icon" href="@assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" /> <link rel="icon" href="@helpers.assets/common/images/gitbucket.png" type="image/vnd.microsoft.icon" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="@assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet"> <link href="@helpers.assets/vendors/bootstrap-3.3.6/css/bootstrap.min.css" rel="stylesheet">
<link href="@assets/vendors/octicons-4.2.0/octicons.css" rel="stylesheet"> <link href="@helpers.assets/vendors/octicons-4.2.0/octicons.css" rel="stylesheet">
<link href="@assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet"> <link href="@helpers.assets/vendors/datepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
<link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet"> <link href="@helpers.assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
<link href="@assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/> <link href="@helpers.assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
<link href="@assets/vendors/facebox/facebox.css" rel="stylesheet"/> <link href="@helpers.assets/vendors/facebox/facebox.css" rel="stylesheet"/>
<link href="@assets/vendors/AdminLTE-2.2.3/css/AdminLTE.min.css" rel="stylesheet"> <link href="@helpers.assets/vendors/AdminLTE-2.2.3/css/AdminLTE.min.css" rel="stylesheet">
<link href="@assets/vendors/AdminLTE-2.2.3/css/skins/skin-blue.min.css" rel="stylesheet"> <link href="@helpers.assets/vendors/AdminLTE-2.2.3/css/skins/skin-blue.min.css" rel="stylesheet">
<link href="@assets/common/css/gitbucket.css" rel="stylesheet"> <link href="@helpers.assets/common/css/gitbucket.css" rel="stylesheet">
<script src="@assets/vendors/jquery/jquery-1.11.1.js"></script> <script src="@helpers.assets/vendors/jquery/jquery-1.11.1.js"></script>
<script src="@assets/vendors/dropzone/dropzone.js"></script> <script src="@helpers.assets/vendors/dropzone/dropzone.js"></script>
<script src="@assets/common/js/validation.js"></script> <script src="@helpers.assets/common/js/validation.js"></script>
<script src="@assets/common/js/gitbucket.js"></script> <script src="@helpers.assets/common/js/gitbucket.js"></script>
<script src="@assets/vendors/bootstrap-3.3.6/js/bootstrap.js"></script> <script src="@helpers.assets/vendors/bootstrap-3.3.6/js/bootstrap.js"></script>
<script src="@assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js"></script> <script src="@helpers.assets/vendors/bootstrap3-typeahead/bootstrap3-typeahead.js"></script>
<script src="@assets/vendors/datepicker/js/moment.js"></script> <script src="@helpers.assets/vendors/datepicker/js/moment.js"></script>
<script src="@assets/vendors/datepicker/js/bootstrap-datetimepicker.min.js"></script> <script src="@helpers.assets/vendors/datepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="@assets/vendors/colorpicker/js/bootstrap-colorpicker.js"></script> <script src="@helpers.assets/vendors/colorpicker/js/bootstrap-colorpicker.js"></script>
<script src="@assets/vendors/google-code-prettify/prettify.js"></script> <script src="@helpers.assets/vendors/google-code-prettify/prettify.js"></script>
<script src="@assets/vendors/zclip/ZeroClipboard.min.js"></script> <script src="@helpers.assets/vendors/zclip/ZeroClipboard.min.js"></script>
<script src="@assets/vendors/elastic/jquery.elastic.source.js"></script> <script src="@helpers.assets/vendors/elastic/jquery.elastic.source.js"></script>
<script src="@assets/vendors/facebox/facebox.js"></script> <script src="@helpers.assets/vendors/facebox/facebox.js"></script>
<script src="@assets/vendors/jquery-hotkeys/jquery.hotkeys.js"></script> <script src="@helpers.assets/vendors/jquery-hotkeys/jquery.hotkeys.js"></script>
<script src="@assets/vendors/jquery-textcomplete-1.6.2/jquery.textcomplete.js"></script> <script src="@helpers.assets/vendors/jquery-textcomplete-1.6.2/jquery.textcomplete.js"></script>
@repository.map { repository => @repository.map { repository =>
@if(!repository.repository.isPrivate){ @if(!repository.repository.isPrivate){
<meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" /> <meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" />
} }
} }
<script src="@assets/vendors/AdminLTE-2.2.3/js/app.js" type="text/javascript"></script> <script src="@helpers.assets/vendors/AdminLTE-2.2.3/js/app.js" type="text/javascript"></script>
</head> </head>
<body class="skin-blue"> <body class="skin-blue">
<div class="wrapper"> <div class="wrapper">
<header class="main-header"> <header class="main-header">
<a href="@path/" class="logo"> <a href="@context.path/" class="logo">
<img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px; display: inline;"/> <img src="@helpers.assets/common/images/gitbucket.png" style="width: 24px; height: 24px; display: inline;"/>
GitBucket GitBucket
<span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span> <span class="header-version">@gitbucket.core.GitBucketCoreModule.getVersions.last.getVersion</span>
</a> </a>
<nav class="navbar navbar-static-top" role="navigation"> <nav class="navbar navbar-static-top" role="navigation">
@repository.map { repository => @repository.map { repository =>
<form id="search" action="@path/search" method="POST" class="navbar-form navbar-left" role="search"> <form id="search" action="@context.path/search" method="POST" class="navbar-form navbar-left" role="search">
<div class="form-group"> <div class="form-group">
<input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search this repository"/> <input type="text" name="query" id="navbar-search-input" class="form-control" placeholder="Search this repository"/>
<input type="hidden" name="owner" value="@repository.owner"/> <input type="hidden" name="owner" value="@repository.owner"/>
@@ -60,44 +59,44 @@
</form> </form>
} }
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@if(loginAccount.isDefined){ @if(context.loginAccount.isDefined){
<li><a href="@path/dashboard/pulls">Pull requests</a></li> <li><a href="@context.path/dashboard/pulls">Pull requests</a></li>
<li><a href="@path/dashboard/issues">Issues</a></li> <li><a href="@context.path/dashboard/issues">Issues</a></li>
} }
@gitbucket.core.plugin.PluginRegistry().getGlobalMenus.map { menu => @gitbucket.core.plugin.PluginRegistry().getGlobalMenus.map { menu =>
@menu(context).map { link => @menu(context).map { link =>
<li><a href="@path/@link.path">@link.label</a></li> <li><a href="@context.path/@link.path">@link.label</a></li>
} }
} }
</ul> </ul>
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@if(loginAccount.isDefined){ @if(context.loginAccount.isDefined){
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle menu" data-toggle="dropdown" href="#"> <a class="dropdown-toggle menu" data-toggle="dropdown" href="#">
<i class="octicon octicon-plus" style="color: black;"></i><span class="caret" style="color: black; vertical-align: middle;"></span> <i class="octicon octicon-plus" style="color: black;"></i><span class="caret" style="color: black; vertical-align: middle;"></span>
</a> </a>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
<li><a href="@path/new">New repository</a></li> <li><a href="@context.path/new">New repository</a></li>
<li><a href="@path/groups/new">New group</a></li> <li><a href="@context.path/groups/new">New group</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName"> <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @context.loginAccount.get.userName">
@avatar(loginAccount.get.userName, 16)<span class="caret" style="color: black; vertical-align: middle;"></span> @helpers.avatar(context.loginAccount.get.userName, 16)<span class="caret" style="color: black; vertical-align: middle;"></span>
</a> </a>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
<li><a href="@url(loginAccount.get.userName)">Your profile</a></li> <li><a href="@helpers.url(context.loginAccount.get.userName)">Your profile</a></li>
<li><a href="@url(loginAccount.get.userName)/_edit">Account settings</a></li> <li><a href="@helpers.url(context.loginAccount.get.userName)/_edit">Account settings</a></li>
@if(loginAccount.get.isAdmin){ @if(context.loginAccount.get.isAdmin){
<li><a href="@path/admin/users">System administration</a></li> <li><a href="@context.path/admin/users">System administration</a></li>
} }
<li><a href="@path/signout">Sign out</a></li> <li><a href="@context.path/signout">Sign out</a></li>
</ul> </ul>
</li> </li>
} else { } else {
<li> <li>
<a href="@path/signin?redirect=@urlEncode(currentPath)" class="pull-right" id="signin">Sign in</a> <a href="@context.path/signin?redirect=@helpers.urlEncode(context.currentPath)" class="pull-right" id="signin">Sign in</a>
</li> </li>
} }
</ul> </ul>
@@ -113,7 +112,7 @@
}); });
}); });
</script> </script>
@PluginRegistry().getJavaScript(request.getRequestURI).map { script => @PluginRegistry().getJavaScript(context.request.getRequestURI).map { script =>
<script> <script>
@Html(script) @Html(script)
</script> </script>

19
src/main/twirl/gitbucket/core/menu.scala.html
View File

@@ -3,8 +3,7 @@
id: Option[String] = None, id: Option[String] = None,
info: Option[Any] = None, info: Option[Any] = None,
error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context) error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import gitbucket.core.view.helpers
@import gitbucket.core.view.helpers._
@menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = { @menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = {
<li @if(active == name){class="active"}> <li @if(active == name){class="active"}>
@@ -13,7 +12,7 @@
<i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> } <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
</a> </a>
} else { } else {
<a href="@url(repository)@path"> <a href="@helpers.url(repository)@path">
<i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> } <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
</a> </a>
} }
@@ -46,7 +45,7 @@
} }
} }
@menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount) @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
@if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
@menuitem("/settings", "settings", "Settings", "tools") @menuitem("/settings", "settings", "Settings", "tools")
} }
@gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu => @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
@@ -61,20 +60,20 @@
<div class="content body"> <div class="content body">
<div class="headbar"> <div class="headbar">
<div class="container"> <div class="container">
@helper.html.information(info) @gitbucket.core.helper.html.information(info)
@helper.html.error(error) @gitbucket.core.helper.html.error(error)
<div class="head"> <div class="head">
@helper.html.repositoryicon(repository, true) @gitbucket.core.helper.html.repositoryicon(repository, true)
<a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a> <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
@defining(repository.repository){ x => @defining(repository.repository){ x =>
@if(repository.repository.originRepositoryName.isDefined){ @if(repository.repository.originRepositoryName.isDefined){
<div class="forked"> <div class="forked">
forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a> forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
</div> </div>
} }
@x.description.map { description => @x.description.map { description =>
<div class="normal muted" style="margin-left: 36px; font-size: 80%;">@detectAndRenderLinks(description)</div> <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@helpers.detectAndRenderLinks(description)</div>
} }
} }
</div> </div>

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

@@ -1,16 +1,15 @@
@()(implicit context: gitbucket.core.controller.Context) @()(implicit context: gitbucket.core.controller.Context)
@import context._ @gitbucket.core.html.main("Sign in"){
@main("Sign in"){
<div class="content-wrapper main-center"> <div class="content-wrapper main-center">
<div class="content body"> <div class="content body">
<div class="signin-form"> <div class="signin-form">
@settings.information.map { information => @context.settings.information.map { information =>
<div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;"> <div class="alert alert-info" style="background-color: white; color: #555; border-color: #4183c4; font-size: small; line-height: 120%;">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
@Html(information) @Html(information)
</div> </div>
} }
@signinform(settings) @gitbucket.core.html.signinform(context.settings)
</div> </div>
</div> </div>
</div> </div>

5
src/main/twirl/gitbucket/core/signinform.scala.html
View File

@@ -1,10 +1,9 @@
@(systemSettings: gitbucket.core.service.SystemSettingsService.SystemSettings)(implicit context: gitbucket.core.controller.Context) @(systemSettings: gitbucket.core.service.SystemSettingsService.SystemSettings)(implicit context: gitbucket.core.controller.Context)
@import context._
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading strong">Sign in</div> <div class="panel-heading strong">Sign in</div>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
<li class="list-group-item"> <li class="list-group-item">
<form action="@path/signin" method="POST" validate="true"> <form action="@context.path/signin" method="POST" validate="true">
<div class="form-group"> <div class="form-group">
<label for="userName">Username:</label> <label for="userName">Username:</label>
<span id="error-userName" class="error"></span> <span id="error-userName" class="error"></span>
@@ -17,7 +16,7 @@
</div> </div>
<input type="submit" class="btn btn-success" value="Sign in"/> <input type="submit" class="btn btn-success" value="Sign in"/>
@if(systemSettings.allowAccountRegistration){ @if(systemSettings.allowAccountRegistration){
or <a href="@path/register">Create new account</a> or <a href="@context.path/register">Create new account</a>
} }
</form> </form>
</li> </li>