Skip to content
Merged

Dev #33

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/net/bndy/wf/config/ApplicationConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class ApplicationConfig {
private String allowedOrigins;
private String defaultUserAvatar;
private boolean renameUploadFile;
private String adminSkin;

public String getAllowedOrigins() {
return allowedOrigins;
Expand Down Expand Up @@ -83,4 +84,12 @@ public String getAppShortName() {
public void setAppShortName(String appShortName) {
this.appShortName = appShortName;
}

public String getAdminSkin() {
return adminSkin;
}

public void setAdminSkin(String adminSkin) {
this.adminSkin = adminSkin;
}
}
2 changes: 2 additions & 0 deletions src/main/java/net/bndy/wf/controller/AdminController.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
@RequestMapping(value = "/admin")
public class AdminController extends _BaseController {


@RequestMapping(value = "/")
public String home(Model model) throws IOException {
model.addAttribute("skin", applicationConfig.getAdminSkin());
model.addAttribute("locale", LocaleContextHolder.getLocale().toString());

File resourcesRoot = new ClassPathResource("/").getFile();
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ application:
mail-sender: zb@bndy.net
allowed-origins: http://bndy.net, http://localhost:5500
default-user-avatar: /static/assets/img/me.png
admin-skin: skin-blue-light

# LOGGING
logging:
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,13 @@ admin.modules.core.userProfile.valueFemale=Female
admin.modules.core.userProfile.labelBirthday=Birthday
admin.modules.core.userProfile.uploadAvatar=Upload Your Avatar
admin.modules.core.userProfile.updateProfile=Update Profile
admin.modules.user.disableEditForSuperAdmin=You can not edit initialization user
admin.modules.user.disableEditForSuperAdmin=You can not edit initialization user.
common.search=Search
admin.modules.user.searchTips=Search by username
common.cancelSearch=Cancel Search
common.noData=No Data Found
common.menu=Menu Navigation
common.searchPlaceHolder=Search...



Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/i18n/messages_zh_CN.properties
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,5 @@ common.search=\u641C\u7D22
admin.modules.user.searchTips=\u7528\u6237\u540D...
common.cancelSearch=\u53D6\u6D88\u641C\u7D22
common.noData=\u672A\u627E\u5230\u4EFB\u4F55\u5339\u914D\u7684\u6570\u636E
common.menu=\u83DC\u5355\u5BFC\u822A
common.searchPlaceHolder=\u641C\u7D22...
17 changes: 0 additions & 17 deletions src/main/resources/static/apps/admin/assets/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions src/main/resources/static/apps/admin/assets/css/style.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
html,
body {
height: 100%;
}

a {
cursor: pointer;
}


/* AdminLTE */

.lockscreen {
display: none;
position: absolute;
Expand Down Expand Up @@ -193,14 +182,6 @@ md-backdrop.md-dialog-backdrop {
}

/* misc */
.no-scroll {
overflow: hidden;
}

.img-radius {
border-radius: 5px;
}

.search-box {
width: 260px;
margin-right: 1rem;
Expand Down
14 changes: 14 additions & 0 deletions src/main/resources/static/apps/admin/assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ $(function () {
$('body').removeClass(mySkins[i])
})

if (cls.indexOf('light') > 0) {
$('.control-sidebar').removeClass('control-sidebar-dark');
$('.control-sidebar').addClass('control-sidebar-light');
} else {
$('.control-sidebar').removeClass('control-sidebar-light');
$('.control-sidebar').addClass('control-sidebar-dark');
}

$('body').addClass(cls)
store('skin', cls)
return false
Expand All @@ -105,6 +113,12 @@ $(function () {
*/
function setup() {
var tmp = get('skin')
if (!tmp) {
if (typeof(defaultSkin) !== 'undefined' && defaultSkin)
tmp = defaultSkin;
else
tmp = 'skin-black-light';
}
if (tmp && $.inArray(tmp, mySkins))
changeSkin(tmp)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<div class="row">
<div class="col-xs-7">
<div class="row">
<div class="form-group col-xs-8">
<div class="form-group col-xs-6">
<label ng-bind="'admin.modules.core.userProfile.labelRealName'|translate"></label>
<input type="text" class="form-control" ng-model="viewModel.realName" />
</div>
<div class="form-group col-xs-4">
<div class="form-group col-xs-6">
<label>&nbsp;</label>
<div class="form-control-static">
<label class="iradio">
Expand Down
41 changes: 17 additions & 24 deletions src/main/resources/static/assets/css/common.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/main/resources/static/assets/css/common.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading