Fix import to resolve errors in IntelliJ

Author: takezoe

src/main/twirl/gitbucket/gist/commentedit.scala.html

@@ -1,5 +1,4 @@
 @(content: String, commentId: Int, userName: String, repoName: String)(implicit context: gitbucket.core.controller.Context)
-@import context._
 <span id="error-edit-content-@commentId" class="error"></span>
 <textarea class="form-control" style="height: 100px;" id="edit-content-@commentId">@content</textarea>
 <div style="margin-top: 6px;">
@@ -17,7 +16,7 @@
   $('#update-comment-@commentId').click(function(){
     $('#update-comment-@commentId, #cancel-comment-@commentId').attr('disabled', 'disabled');
     $.ajax({
-      url: '@path/gist/@userName/@repoName/_comments/@commentId/_update',
+      url: '@context.path/gist/@userName/@repoName/_comments/@commentId/_update',
       type: 'POST',
       data: {
         issueId : 0,	// TODO
@@ -33,7 +32,7 @@
 
   $('#cancel-comment-@commentId').click(function(){
     $('#update-comment-@commentId, #cancel-comment-@commentId').attr('disabled', 'disabled');
-    $.get('@path/gist/@userName/@repoName/_comments/@commentId', callback);
+    $.get('@context.path/gist/@userName/@repoName/_comments/@commentId', callback);
     return false;
   });
 });

src/main/twirl/gitbucket/gist/commentform.scala.html

@@ -1,10 +1,9 @@
 @(gist: gitbucket.gist.model.Gist)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
-@if(loginAccount.isDefined){
+@import gitbucket.core.view.helpers
+@if(context.loginAccount.isDefined){
   <hr/><br/>
-  <form method="POST" validate="true" action="@path/gist/@gist.userName/@gist.repositoryName/_comment">
-    <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+  <form method="POST" validate="true" action="@context.path/gist/@gist.userName/@gist.repositoryName/_comment">
+    <div class="issue-avatar-image">@helpers.avatar(context.loginAccount.get.userName, 48)</div>
     <div class="panel panel-default issue-comment-box">
       <div class="panel-body">
         @gitbucket.gist.html.commentpreview(

src/main/twirl/gitbucket/gist/commentlist.scala.html

@@ -2,39 +2,38 @@
   comments: Seq[gitbucket.gist.model.GistComment],
   hasWritePermission: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @comments.map { comment =>
-  <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
+  <div class="issue-avatar-image">@helpers.avatar(comment.commentedUserName, 48)</div>
   <div class="panel panel-default issue-comment-box" id="comment-@comment.commentId">
     <div class="panel-heading">
-      @user(comment.commentedUserName, styleClass="username strong")
+      @helpers.user(comment.commentedUserName, styleClass="username strong")
       <span class="muted">
         commented
         @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
       </span>
       <span class="pull-right">
-      @if((hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
+      @if((hasWritePermission || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
         <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil" aria-label="Edit"></i></a>&nbsp;
         <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x" aria-label="Remove"></i></a>
       }
       </span>
     </div>
     <div class="panel-body issue-content markdown-body" id="commentContent-@comment.commentId">
-      @markdown(comment.content, repository, false, true, true, hasWritePermission)
+      @helpers.markdown(comment.content, repository, false, true, true, hasWritePermission)
     </div>
   </div>
 }
 <script>
 $(function(){
   $('.issue-comment-box i.octicon-pencil').click(function(){
     var id  = $(this).closest('a').data('comment-id');
-    var url = '@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id;
+    var url = '@context.path/gist/@gist.userName/@gist.repositoryName/_comments/' + id;
     var $content = $('#commentContent-' + id);
 
     if(!id){
       id  = $(this).closest('a').data('issue-id');
-      url = '@url(repository)/issues/_data/' + id;
+      url = '@helpers.url(repository)/issues/_data/' + id;
       $content = $('#issueContent');
     }
 
@@ -46,7 +45,7 @@
   $('.issue-comment-box i.octicon-x').click(function(){
     if(confirm('Are you sure you want to delete this?')) {
       var id = $(this).closest('a').data('comment-id');
-      $.post('@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id + '/_delete',
+      $.post('@context.path/gist/@gist.userName/@gist.repositoryName/_comments/' + id + '/_delete',
       function(data){
         if(data > 0) {
           $('#comment-' + id).prev('div.issue-avatar-image').remove();
@@ -58,7 +57,7 @@
   });
   $(document).on('click', '.commit-comment-box i.icon-pencil', function(){
     var id  = $(this).closest('a').data('comment-id');
-    var url = '@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id;
+    var url = '@context.path/gist/@gist.userName/@gist.repositoryName/_comments/' + id;
     var $content = $('.commit-commentContent-' + id, $(this).closest('.box'));
 
     $.get(url, { dataType : 'html' }, function(data){
@@ -69,7 +68,7 @@
   $(document).on('click', '.commit-comment-box i.icon-remove-circle', function(){
     if(confirm('Are you sure you want to delete this?')) {
       var id = $(this).closest('a').data('comment-id');
-      $.post('@path/gist/@gist.userName/@gist.repositoryName/_comments/' + id + '/_delete',
+      $.post('@context.path/gist/@gist.userName/@gist.repositoryName/_comments/' + id + '/_delete',
       function(data){
         if(data > 0) {
           $('.commit-comment-' + id).closest('.not-diff').remove();

src/main/twirl/gitbucket/gist/commentpreview.scala.html

@@ -4,9 +4,7 @@
   style: String = "",
   elastic: Boolean = false,
   uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 <div class="tabbable">
   <ul class="nav nav-tabs fill-width" style="margin-bottom: 10px;">
     <li class="active"><a href="#tab@uid" data-toggle="tab">Write</a></li>
@@ -30,8 +28,8 @@
   }
 
   $('#preview@uid').click(function(){
-    $('#preview-area@uid').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
-    $.post('@path/gist/@gist.userName/@gist.repositoryName/_preview', {
+    $('#preview-area@uid').html('<img src="@helpers.assets/common/images/indicator.gif"> Previewing...');
+    $.post('@context.path/gist/@gist.userName/@gist.repositoryName/_preview', {
       content        : $('#content@uid').val()
     }, function(data){
       $('#preview-area@uid').html(data);

src/main/twirl/gitbucket/gist/detail.scala.html

@@ -5,8 +5,7 @@
   files: Seq[(String, String)],
   comments: Seq[gitbucket.gist.model.GistComment],
   editable: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main(if(gist.description.isEmpty) gist.repositoryName else gist.description){
   @gitbucket.gist.html.style()
   @gitbucket.gist.html.header(gist, forkedCount, editable)
@@ -21,12 +20,12 @@
           <div class="panel-heading strong" style="padding: 6px; line-height: 30px;">
             @fileName
             <div class="pull-right">
-              <a href="@path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>
+              <a href="@context.path/gist/@gist.userName/@gist.repositoryName/raw/@revision/@fileName" class="btn btn-sm btn-default">Raw</a>
             </div>
           </div>
-          @if(isRenderable(fileName)){
+          @if(helpers.isRenderable(fileName)){
             <div class="panel-body markdown-body" style="padding-left: 16px; padding-right: 16px;">
-              @renderMarkup(List(fileName), content, "master", gist.toRepositoryInfo, false, false, true)
+              @helpers.renderMarkup(List(fileName), content, "master", gist.toRepositoryInfo, false, false, true)
             </div>
           } else {
             <div class="panel-body">

src/main/twirl/gitbucket/gist/edit.scala.html

@@ -1,8 +1,7 @@
 @(gist: Option[gitbucket.gist.model.Gist],
   files: Seq[(String, gitbucket.core.util.JGitUtil.ContentInfo)])(implicit context: gitbucket.core.controller.Context)
-@import context._
 @import gitbucket.gist.model.Mode
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Snippets"){
   @gitbucket.gist.html.style()
   <div class="container head">
@@ -11,9 +10,9 @@
       <h1 style="margin: 0px;">New snippet</h1>
     } else {
       @gist.map { x =>
-        @avatar(gist.get.userName, 24)
+        @helpers.avatar(gist.get.userName, 24)
         Editing
-        <a class="strong" href="@path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
+        <a class="strong" href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName">@gist.get.title</a>
         @if(gist.get.mode == Mode.Secret.code){
           <span class="label label-warning">Secret</span>
         }
@@ -28,7 +27,7 @@ <h1 style="margin: 0px;">New snippet</h1>
             <a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/secret" class="btn btn-default">Make secret</a>
           }
           *@
-          <a href="@path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
+          <a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
         </div>
         <div class="muted" style="margin-left: 30px; font-size: 80%;">
           Created at @gist.get.registeredDate
@@ -49,7 +48,7 @@ <h1 style="margin: 0px;">New snippet</h1>
         <input type="button" value="Add file" class="btn btn-default" id="add_file">
         <div class="pull-right">
           @if(gist.isDefined){
-            <a href="@path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-default">Cancel</a>
+            <a href="@context.path/gist/@gist.get.userName/@gist.get.repositoryName" class="btn btn-default">Cancel</a>
           }
           <div class="btn-group" data-toggle="buttons">
             <label class="btn btn-default btn-mini @if(gist.isEmpty   || gist.get.mode == Mode.Public.code ){active}"><input type="radio" value="PUBLIC" name="mode">Public</label>
@@ -77,20 +76,20 @@ <h1 style="margin: 0px;">New snippet</h1>
   <script>
   $(function(){
     $('#create_snippet').click(function(){
-      $('#form').attr('action', '@path/gist/_new')
+      $('#form').attr('action', '@context.path/gist/_new')
     });
 
     $('#add_file').click(function(){
       var count = parseInt($('#count').val());
-      $.get('@path/gist/_add?count=' + count, function(html){
+      $.get('@context.path/gist/_add?count=' + count, function(html){
         $('#editors').append(html);
         $('#count').val(count + 1);
       });
     });
 
     $('#update_snippet').click(function(){
       @gist.map { gist =>
-        $('#form').attr('action', '@path/gist/@gist.userName/@gist.repositoryName/edit')
+        $('#form').attr('action', '@context.path/gist/@gist.userName/@gist.repositoryName/edit')
       }
     });
 

src/main/twirl/gitbucket/gist/editor.scala.html

@@ -1,8 +1,7 @@
 @(i: Int,
   fileName: String,
   content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 <div class="panel panel-default">
   <div class="panel-heading" style="padding: 6px;">
     <div class="pull-right">
@@ -31,7 +30,7 @@
   editor.setTheme("ace/theme/monokai");
 
   @if(fileName.nonEmpty){
-    editor.getSession().setMode("ace/mode/@editorType(fileName)");
+    editor.getSession().setMode("ace/mode/@helpers.editorType(fileName)");
   }
 
   $('#wrap-@i').change(function(){

src/main/twirl/gitbucket/gist/forks.scala.html

@@ -3,8 +3,7 @@
   repositoryUrl: gitbucket.gist.util.GistUtils.GistRepositoryURL,
   forkedGists: Seq[gitbucket.gist.model.Gist],
   editable: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Snippets"){
   @gitbucket.gist.html.style()
   @gitbucket.gist.html.header(gist, forkedCount, editable)
@@ -13,10 +12,10 @@
     <div style="margin-right: 260px;">
       @forkedGists.map { forkedGist =>
         <div class="block">
-          @avatar(forkedGist.userName, 20)
-          <a href="@path/gist/@forkedGist.userName/@forkedGist.repositoryName">@forkedGist.userName</a>
+          @helpers.avatar(forkedGist.userName, 20)
+          <a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName">@forkedGist.userName</a>
           <div class="pull-right">
-            <a href="@path/gist/@forkedGist.userName/@forkedGist.repositoryName" class="btn btn-sm btn-default">View Fork</a>
+            <a href="@context.path/gist/@forkedGist.userName/@forkedGist.repositoryName" class="btn btn-sm btn-default">View Fork</a>
           </div>
         </div>
       }

src/main/twirl/gitbucket/gist/header.scala.html

@@ -1,13 +1,12 @@
 @(gist: gitbucket.gist.model.Gist,
   forkedCount: Int,
   editable: Boolean)(implicit context: gitbucket.core.controller.Context)
-@import context._
 @import gitbucket.gist.model.Mode
-@import gitbucket.core.view.helpers._
+@import gitbucket.core.view.helpers
 <div class="container head">
-  @avatar(gist.userName, 24)
-  <a href="@path/gist/@gist.userName">@gist.userName</a> /
-  <a href="@path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
+  @helpers.avatar(gist.userName, 24)
+  <a href="@context.path/gist/@gist.userName">@gist.userName</a> /
+  <a href="@context.path/gist/@gist.userName/@gist.repositoryName" class="strong">@gist.title</a>
   @if(gist.mode == Mode.Secret.code){
     <span class="label label-warning">Secret</span>
   }
@@ -16,32 +15,32 @@
   }
   <div class="pull-right">
     @if(editable){
-      <a href="@path/gist/@gist.userName/@gist.repositoryName/edit" class="btn btn-default">Edit</a>
-      <a href="@path/gist/@gist.userName/@gist.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
+      <a href="@context.path/gist/@gist.userName/@gist.repositoryName/edit" class="btn btn-default">Edit</a>
+      <a href="@context.path/gist/@gist.userName/@gist.repositoryName/delete" class="btn btn-danger" id="delete">Delete</a>
     }
     @if(gist.originUserName.isEmpty){
-      @if(loginAccount.isEmpty){
-        <a href="@path/signin?redirect=@urlEncode(s"${path}/gist/${gist.userName}/${gist.repositoryName}")" class="btn btn-default">Fork <span class="badge">@forkedCount</span></a>
+      @if(context.loginAccount.isEmpty){
+        <a href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/gist/${gist.userName}/${gist.repositoryName}")" class="btn btn-default">Fork <span class="badge">@forkedCount</span></a>
       } else {
         <a id="fork-link" href="javascript:void(0);" class="btn btn-default">Fork <span class="badge">@forkedCount</span></a>
       }
-      @if(loginAccount.isDefined){
-        <form id="fork-form" method="post" action="@path/gist/@gist.userName/@gist.repositoryName/fork">
+      @if(context.loginAccount.isDefined){
+        <form id="fork-form" method="post" action="@context.path/gist/@gist.userName/@gist.repositoryName/fork">
         </form>
       }
     }
   </div>
   <div class="muted" style="margin-left: 30px; font-size: 80%;">
     Created at @gist.registeredDate
     @if(gist.originUserName.isDefined){
-      - forked from <a href="@path/gist/@gist.originUserName/@gist.originRepositoryName">@gist.originUserName/@gist.originRepositoryName</a>
+      - forked from <a href="@context.path/gist/@gist.originUserName/@gist.originRepositoryName">@gist.originUserName/@gist.originRepositoryName</a>
     }
   </div>
 </div>
 <hr style="margin-bottom: 20px;"/>
 <script>
 $(function(){
-  @if(loginAccount.isDefined){
+  @if(context.loginAccount.isDefined){
     $(document).on("click", "a#fork-link", function(e) {
       e.preventDefault();
       $('#fork-form').submit();