Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove helpers.skinName. (by review comment)

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2017-08-18 01:55:56 +09:00
parent 91deeb969b
commit a6cb71f9c3
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/gitbucket/core/view/helpers.scala
View File

@@ -412,10 +412,4 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
*/ */
def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0)) def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0))
/**
* returns selected skin-name
*/
def skinName(implicit context: Context): String = context.settings.skinName
} }

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

@@ -370,7 +370,7 @@
"skin-yellow", "skin-yellow",
"skin-yellow-light", "skin-yellow-light",
).map{ skin => ).map{ skin =>
<option @if(skin == helpers.skinName){selected}>@skin</option> <option @if(skin == context.settings.skinName){selected}>@skin</option>
} }
</select> </select>
</div> </div>

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

@@ -16,7 +16,7 @@
<link href="@helpers.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="@helpers.assets("/vendors/facebox/facebox.css")" rel="stylesheet"/> <link href="@helpers.assets("/vendors/facebox/facebox.css")" rel="stylesheet"/>
<link href="@helpers.assets("/vendors/AdminLTE-2.3.11/css/AdminLTE.min.css")" rel="stylesheet"> <link href="@helpers.assets("/vendors/AdminLTE-2.3.11/css/AdminLTE.min.css")" rel="stylesheet">
<link href="@helpers.assets(s"/vendors/AdminLTE-2.3.11/css/skins/${helpers.skinName}.min.css")" rel="stylesheet"> <link href="@helpers.assets(s"/vendors/AdminLTE-2.3.11/css/skins/${context.settings.skinName}.min.css")" rel="stylesheet">
<link href="@helpers.assets("/vendors/font-awesome-4.6.3/css/font-awesome.min.css")" rel="stylesheet"> <link href="@helpers.assets("/vendors/font-awesome-4.6.3/css/font-awesome.min.css")" rel="stylesheet">
<link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.min.css")" rel="stylesheet"> <link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.min.css")" rel="stylesheet">
<link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.structure.min.css")" rel="stylesheet"> <link href="@helpers.assets("/vendors/jquery-ui/jquery-ui.structure.min.css")" rel="stylesheet">
@@ -42,7 +42,7 @@
} }
<script src="@helpers.assets("/vendors/AdminLTE-2.3.11/js/app.js")" type="text/javascript"></script> <script src="@helpers.assets("/vendors/AdminLTE-2.3.11/js/app.js")" type="text/javascript"></script>
</head> </head>
<body class="@helpers.skinName page-load @if(body.toString.contains("menu-item-hover")){sidebar-mini} @if(context.sidebarCollapse){sidebar-collapse}"> <body class="@context.settings.skinName page-load @if(body.toString.contains("menu-item-hover")){sidebar-mini} @if(context.sidebarCollapse){sidebar-collapse}">
<div class="wrapper"> <div class="wrapper">
<header class="main-header"> <header class="main-header">
<a href="@context.path/" class="logo"> <a href="@context.path/" class="logo">