Skip to content

Commit 80cfe28

Browse files
committed
corrects typo and displays right logo in header
1 parent 98f0662 commit 80cfe28

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/main/java/org/tdl/vireo/config/constant/ConfigurationName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class ConfigurationName {
9999
public final static String LEFT_LOGO = "left_logo";
100100

101101
/** Custom CSS */
102-
public final static String RIGTH_LOGO = "right_logo";
102+
public final static String RIGHT_LOGO = "right_logo";
103103

104104
/** Custom CSS */
105105
public final static String CUSTOM_CSS = "custom_css";

src/main/resources/templates/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
<a class="pull-left" th:href="${#strings.isEmpty(base) ? '/' : base}">
117117
<img style="max-height: 65px;" ng-src="{{logoImage()}}" alt="Thesis Submission Portal Home" />
118118
</a>
119+
<div class="pull-right">
120+
<img style="max-height: 65px;" ng-src="{{rightLogoImage()}}" alt="Right Logo" />
121+
</div>
119122
<ul ng-if="activeAdminSection()" class="tab-nav nav navbar-nav navbar-right hidden-xs">
120123
<li ng-class="{'active': activeTab('/admin/list')}">
121124
<a href="admin/list">List</a>

src/main/webapp/app/controllers/headerController.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ vireo.controller("HeaderController", function ($scope, $controller, $location, $
99
ManagedConfigurationRepo.ready().then(function() {
1010
if ($scope.configurable.lookAndFeel) {
1111
$scope.logoPath = $scope.configurable.lookAndFeel.left_logo.value;
12+
$scope.rightLogo = $scope.configurable.lookAndFeel.right_logo.value;
1213
}
1314

1415
$scope.logoImage = function() {
@@ -24,6 +25,15 @@ vireo.controller("HeaderController", function ($scope, $controller, $location, $
2425
return $scope.logoPath;
2526
};
2627

28+
$scope.rightLogoImage = function() {
29+
if ($scope.configurable.lookAndFeel && $scope.configurable.lookAndFeel.right_logo) {
30+
return $scope.configurable.lookAndFeel.right_logo.value;
31+
}
32+
33+
return "resources/images/default-right-logo.png";
34+
};
35+
36+
2737
$scope.activeTab = function(path) {
2838
return $location.url().indexOf(path) >= 0;
2939
};

0 commit comments

Comments
 (0)