From f3646e28a6732efad9617ba201a58a93ba39957e Mon Sep 17 00:00:00 2001 From: anhefti Date: Fri, 23 Aug 2019 11:22:57 +0200 Subject: [PATCH] SEBSERV-56 implemented --- docker/demo/Dockerfile | 2 +- docker/demo/docker-compose.yml | 8 ++++---- .../gui/content/action/ActionDefinition.java | 16 ++++++++-------- src/main/resources/messages.properties | 16 ++++++++-------- src/main/resources/messages_en.properties | 12 ++++++------ 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile index 56779669..ca613464 100644 --- a/docker/demo/Dockerfile +++ b/docker/demo/Dockerfile @@ -32,6 +32,6 @@ COPY --from=1 /demo/target/seb-server-"$SEBSERVER_VERSION".jar /demo ENTRYPOINT ["sh", "-c"] -CMD ["java -jar seb-server-${SEBSERVER_VERSION}.jar --server.address=${SERVER_ADDRESS} --server.port=${SERVER_PORT} --spring.config.location=classpath:/config/ --datastore.mariadb.server.address=${DBSERVER_ADDRESS} --datastore.mariadb.server.port${DBSERVER_PORT} --spring.profiles.active=demo --spring.datasource.password=${DBSERVER_PWD} --sebserver.webservice.api.admin.clientSecret={GUICLIENT_PWD} --sebserver.webservice.internalSecret=${INTERNAL_PWD}"] +CMD ["java -jar seb-server-${SEBSERVER_VERSION}.jar --server.address=${SERVER_ADDRESS} --server.port=${SERVER_PORT} --spring.config.location=classpath:/config/ --datastore.mariadb.server.address=${DBSERVER_ADDRESS} --datastore.mariadb.server.port${DBSERVER_PORT} --spring.profiles.active=demo --spring.datasource.password=${DBSERVER_PWD} --sebserver.webservice.api.admin.clientSecret=${GUICLIENT_PWD} --sebserver.webservice.internalSecret=${INTERNAL_PWD}"] EXPOSE 8080 \ No newline at end of file diff --git a/docker/demo/docker-compose.yml b/docker/demo/docker-compose.yml index e99a582e..5eb6d8e4 100644 --- a/docker/demo/docker-compose.yml +++ b/docker/demo/docker-compose.yml @@ -4,7 +4,7 @@ services: image: "mariadb/server:10.3" container_name: seb-server-mariadb environment: - MYSQL_ROOT_PASSWORD: somePW + MYSQL_ROOT_PASSWORD: ports: - 3306:3306 networks: @@ -22,9 +22,9 @@ services: - SERVER_PORT=8080 - DBSERVER_ADDRESS=seb-server-mariadb - DBSERVER_PORT=3306 - - DBSERVER_PWD=somePW - - GUICLIENT_PWD=somePW - - INTERNAL_PWD=somePW + - DBSERVER_PWD= + - GUICLIENT_PWD= + - INTERNAL_PWD= ports: - 8080:8080 networks: diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index bf480b75..c549f4c3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -99,12 +99,12 @@ public enum ActionDefinition { ActionCategory.FORM), USER_ACCOUNT_ACTIVATE( new LocTextKey("sebserver.useraccount.action.activate"), - ImageIcon.INACTIVE, + ImageIcon.TOGGLE_OFF, PageStateDefinition.USER_ACCOUNT_VIEW, ActionCategory.FORM), USER_ACCOUNT_DEACTIVATE( new LocTextKey("sebserver.useraccount.action.deactivate"), - ImageIcon.ACTIVE, + ImageIcon.TOGGLE_ON, PageStateDefinition.USER_ACCOUNT_VIEW, ActionCategory.FORM), USER_ACCOUNT_CHANGE_PASSOWRD( @@ -162,12 +162,12 @@ public enum ActionDefinition { ActionCategory.FORM), LMS_SETUP_ACTIVATE( new LocTextKey("sebserver.lmssetup.action.activate"), - ImageIcon.INACTIVE, + ImageIcon.TOGGLE_OFF, PageStateDefinition.LMS_SETUP_VIEW, ActionCategory.FORM), LMS_SETUP_DEACTIVATE( new LocTextKey("sebserver.lmssetup.action.deactivate"), - ImageIcon.ACTIVE, + ImageIcon.TOGGLE_ON, PageStateDefinition.LMS_SETUP_VIEW, ActionCategory.FORM), @@ -218,12 +218,12 @@ public enum ActionDefinition { ActionCategory.FORM), EXAM_ACTIVATE( new LocTextKey("sebserver.exam.action.activate"), - ImageIcon.INACTIVE, + ImageIcon.TOGGLE_OFF, PageStateDefinition.EXAM_VIEW, ActionCategory.FORM), EXAM_DEACTIVATE( new LocTextKey("sebserver.exam.action.deactivate"), - ImageIcon.ACTIVE, + ImageIcon.TOGGLE_ON, PageStateDefinition.EXAM_VIEW, ActionCategory.FORM), @@ -322,12 +322,12 @@ public enum ActionDefinition { ActionCategory.FORM), SEB_CLIENT_CONFIG_ACTIVATE( new LocTextKey("sebserver.clientconfig.action.activate"), - ImageIcon.INACTIVE, + ImageIcon.TOGGLE_OFF, PageStateDefinition.SEB_CLIENT_CONFIG_VIEW, ActionCategory.FORM), SEB_CLIENT_CONFIG_DEACTIVATE( new LocTextKey("sebserver.clientconfig.action.deactivate"), - ImageIcon.ACTIVE, + ImageIcon.TOGGLE_ON, PageStateDefinition.SEB_CLIENT_CONFIG_VIEW, ActionCategory.FORM), SEB_CLIENT_CONFIG_EXPORT( diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 79668a8a..d696c172 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -118,8 +118,8 @@ sebserver.institution.action.list.view=View Institution sebserver.institution.action.list.modify=Edit Institution sebserver.institution.action.modify=Edit sebserver.institution.action.save=Save Institution -sebserver.institution.action.activate=Toggle Activity -sebserver.institution.action.deactivate=Toggle Activity +sebserver.institution.action.activate=Activate Institution +sebserver.institution.action.deactivate=Deactivate Institution sebserver.institution.action.delete=Delete Institution sebserver.institution.info.pleaseSelect=Please Select an Institution first. @@ -158,8 +158,8 @@ sebserver.useraccount.action.view=View User Account sebserver.useraccount.action.list.modify=Edit User Account sebserver.useraccount.action.modify=Edit sebserver.useraccount.action.save=Save User Account -sebserver.useraccount.action.activate=Activate -sebserver.useraccount.action.deactivate=Deactivate +sebserver.useraccount.action.activate=Activate Account +sebserver.useraccount.action.deactivate=Deactivate Account sebserver.useraccount.action.delete=Delete User Account sebserver.useraccount.action.change.password=Change Password sebserver.useraccount.action.change.password.save=Save New Password @@ -215,8 +215,8 @@ sebserver.lmssetup.action.test.quizRequestError=Unable to request courses or qui sebserver.lmssetup.action.test.missingParameter=There is one or more missing connection parameter.
Please check the connection parameter for this LMS Setup sebserver.lmssetup.action.test.unknownError=An unexpected error happened while trying to connect to the LMS course API. {0} sebserver.lmssetup.action.save=Save LMS Setup -sebserver.lmssetup.action.activate=Activate -sebserver.lmssetup.action.deactivate=Deactivate +sebserver.lmssetup.action.activate=Activate LMS Setup +sebserver.lmssetup.action.deactivate=Deactivate LMS Setup sebserver.lmssetup.action.delete=Delete LMS Setup sebserver.lmssetup.info.pleaseSelect=Please Select a LMS Setup first @@ -399,8 +399,8 @@ sebserver.clientconfig.action.list.view=View Configuration sebserver.clientconfig.action.list.modify=Edit Configuration sebserver.clientconfig.action.modify=Edit sebserver.clientconfig.action.save=Save -sebserver.clientconfig.action.activate=Activate -sebserver.clientconfig.action.deactivate=Deactivate +sebserver.clientconfig.action.activate=Activate Configuration +sebserver.clientconfig.action.deactivate=Deactivate Configuration ################################ # SEB Exam Configuration diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index e9ec9653..c8ffa1a5 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -84,8 +84,8 @@ sebserver.institution.action.list.view=View Institution sebserver.institution.action.list.modify=Edit Institution sebserver.institution.action.modify=Edit sebserver.institution.action.save=Save Institution -sebserver.institution.action.activate=Toggle Activity -sebserver.institution.action.deactivate=Toggle Activity +sebserver.institution.action.activate=Activate Institution +sebserver.institution.action.deactivate=Deactivate Institution sebserver.institution.action.delete=Delete Institution sebserver.institution.action.export.sebconfig=SEB Client Config @@ -124,8 +124,8 @@ sebserver.useraccount.action.view=View User Account sebserver.useraccount.action.list.modify=Edit User Account sebserver.useraccount.action.modify=Edit sebserver.useraccount.action.save=Save User Account -sebserver.useraccount.action.activate=Activate -sebserver.useraccount.action.deactivate=Deactivate +sebserver.useraccount.action.activate=Activate Account +sebserver.useraccount.action.deactivate=Deactivate Account sebserver.useraccount.action.delete=Delete User Account sebserver.useraccount.action.change.password=Change Password sebserver.useraccount.action.change.password.save=Save New Password @@ -179,8 +179,8 @@ sebserver.lmssetup.action.test.quizRequestError=Unable to request courses or qui sebserver.lmssetup.action.test.missingParameter=There is one or more missing connection parameter.
Please check the connection parameter for this LMS Setup sebserver.lmssetup.action.test.unknownError=An unexpected error happened while trying to connect to the LMS course API. {0} sebserver.lmssetup.action.save=Save LMS Setup -sebserver.lmssetup.action.activate=Activate -sebserver.lmssetup.action.deactivate=Deactivate +sebserver.lmssetup.action.activate=Activate LMS Setup +sebserver.lmssetup.action.deactivate=Deactivate LMS Setup sebserver.lmssetup.action.delete=Delete LMS Setup sebserver.lmssetup.info.pleaseSelect=Please Select a LMS Setup first