diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
index 672b8e0c..1b6fc464 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
@@ -120,26 +120,23 @@ public class ThemeResource extends BaseResource {
}
@PUT
- @Path("images")
+ @Path("image/{type: logo|background}")
@Consumes("multipart/form-data")
- public Response images(
- @FormDataParam("logo") FormDataBodyPart logoBodyPart,
- @FormDataParam("background") FormDataBodyPart backgrounBodyPart) {
+ public Response images(@PathParam("type") String type,
+ @FormDataParam("image") FormDataBodyPart imageBodyPart) {
if (!authenticate()) {
throw new ForbiddenClientException();
}
checkBaseFunction(BaseFunction.ADMIN);
- if (logoBodyPart == null && backgrounBodyPart == null) {
- throw new ClientException("NoImageProvided", "logo or background is required");
+ if (imageBodyPart == null) {
+ throw new ClientException("NoImageProvided", "An image is required");
}
// Only a background or a logo is handled
- FormDataBodyPart bodyPart = logoBodyPart == null ? backgrounBodyPart : logoBodyPart;
- String type = logoBodyPart == null ? BACKGROUND_IMAGE : LOGO_IMAGE;
java.nio.file.Path filePath = DirectoryUtil.getThemeDirectory().resolve(type);
// Copy the image to the theme directory
- try (InputStream inputStream = bodyPart.getValueAs(InputStream.class)) {
+ try (InputStream inputStream = imageBodyPart.getValueAs(InputStream.class)) {
Files.copy(inputStream, filePath, StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) {
throw new ServerException("CopyError", "Error copying the image to the theme directory", e);
@@ -152,10 +149,6 @@ public class ThemeResource extends BaseResource {
@Produces("image/*")
@Path("image/{type: logo|background}")
public Response getImage(@PathParam("type") final String type) {
- if (!LOGO_IMAGE.equals(type) && !BACKGROUND_IMAGE.equals(type)) {
- throw new ClientException("InvalidType", "Type must be logo or background");
- }
-
final java.nio.file.Path filePath = DirectoryUtil.getThemeDirectory().resolve(type);
// Copy the image to the response output
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
index 02a06f9d..01733743 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
@@ -18,5 +18,36 @@ angular.module('docs').controller('SettingsTheme', function($scope, $rootScope,
stylesheet.href = stylesheet.href.replace(/\?.*|$/, '?' + new Date().getTime());
$rootScope.appName = $scope.theme.name;
});
- }
+ };
+
+ // Send an image
+ $scope.sendingImage = false;
+ $scope.sendImage = function(type, image) {
+ // Build the payload
+ var formData = new FormData();
+ formData.append('image', image);
+
+ // Send the file
+ var done = function() {
+ $scope.$apply(function() {
+ $scope.sendingImage = false;
+ $scope[type] = null;
+ });
+ };
+ $scope.sendingImage = true;
+ $.ajax({
+ type: 'PUT',
+ url: '../api/theme/image/' + type,
+ data: formData,
+ cache: false,
+ contentType: false,
+ processData: false,
+ success: function() {
+ done();
+ },
+ error: function() {
+ done();
+ }
+ });
+ };
});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/File.js b/docs-web/src/main/webapp/src/app/docs/directive/File.js
index f1fe09ed..1475755e 100644
--- a/docs-web/src/main/webapp/src/app/docs/directive/File.js
+++ b/docs-web/src/main/webapp/src/app/docs/directive/File.js
@@ -10,12 +10,11 @@ angular.module('docs').directive('file', function() {
replace: true,
require: 'ngModel',
link: function(scope, element, attr, ctrl) {
- var listener = function() {
+ element.bind('change', function() {
scope.$apply(function() {
- attr.multiple ? ctrl.$setViewValue(element[0].files) : ctrl.$setViewValue(element[0].files[0]);
+ attr.multiple ? ctrl.$setViewValue(element[0].files) : ctrl.$setViewValue(element[0].files[0]);
});
- }
- element.bind('change', listener);
+ });
}
}
});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.theme.html b/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
index 0b0f611d..5f046bc5 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
@@ -12,7 +12,7 @@
+ data-color="" ng-model="theme.color" ng-style="{ 'background': theme.color }">
@@ -23,4 +23,41 @@
id="inputCss" ng-model="theme.css" ng-blur="update()">
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
index 1718e0f5..25e47a14 100644
--- a/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
+++ b/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
@@ -72,11 +72,11 @@ public class TestThemeResource extends BaseJerseyTest {
// Change the logo
try (InputStream is = Resources.getResource("file/PIA00452.jpg").openStream()) {
- StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("logo", is, "PIA00452.jpg");
+ StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("image", is, "PIA00452.jpg");
try (FormDataMultiPart multiPart = new FormDataMultiPart()) {
target()
.register(MultiPartFeature.class)
- .path("/theme/images").request()
+ .path("/theme/image/logo").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.put(Entity.entity(multiPart.bodyPart(streamDataBodyPart),
MediaType.MULTIPART_FORM_DATA_TYPE), JsonObject.class);
@@ -85,11 +85,11 @@ public class TestThemeResource extends BaseJerseyTest {
// Change the background
try (InputStream is = Resources.getResource("file/Einstein-Roosevelt-letter.png").openStream()) {
- StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("background", is, "Einstein-Roosevelt-letter.png");
+ StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("image", is, "Einstein-Roosevelt-letter.png");
try (FormDataMultiPart multiPart = new FormDataMultiPart()) {
target()
.register(MultiPartFeature.class)
- .path("/theme/images").request()
+ .path("/theme/image/background").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.put(Entity.entity(multiPart.bodyPart(streamDataBodyPart),
MediaType.MULTIPART_FORM_DATA_TYPE), JsonObject.class);