improved tool-tips

src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java

@@ -110,13 +110,11 @@ public class InstitutionForm implements TemplateComposer {
                 .addField(FormBuilder.text(
                         Domain.INSTITUTION.ATTR_NAME,
                         FORM_NAME_TEXT_KEY,
-                        institution.name)
+                        institution.name))
-                        .withInfoLeft(new LocTextKey("some info text here!\nwith line brake")))
                 .addField(FormBuilder.text(
                         Domain.INSTITUTION.ATTR_URL_SUFFIX,
                         FORM_URL_SUFFIX_TEXT_KEY,
-                        institution.urlSuffix)
+                        institution.urlSuffix))
-                        .withInfoRight(new LocTextKey("some info text here!\nwith line brake")))
                 .addField(FormBuilder.imageUpload(
                         Domain.INSTITUTION.ATTR_LOGO_IMAGE,
                         FORM_LOGO_IMAGE_TEXT_KEY,

src/main/java/ch/ethz/seb/sebserver/gui/form/FieldBuilder.java

@@ -23,6 +23,10 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
 import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.CustomVariant;
 
 public abstract class FieldBuilder<T> {
+
+    public static final String TOOLTIP_KEY_SUFFIX_LEFT = ".tooltip.left";
+    public static final String TOOLTIP_KEY_SUFFIX_RIGHT = ".tooltip.right";
+
     int spanLabel = -1;
     int spanInput = -1;
     int spanEmptyCell = -1;
@@ -32,18 +36,19 @@ public abstract class FieldBuilder<T> {
     boolean readonly = false;
     boolean visible = true;
     String defaultLabel = null;
-    LocTextKey infoText;
-    boolean infoLeft = false;
-    boolean infoRight = false;
 
     final String name;
     final LocTextKey label;
+    final LocTextKey tooltipKeyLeft;
+    final LocTextKey tooltipKeyRight;
     final T value;
 
     protected FieldBuilder(final String name, final LocTextKey label, final T value) {
         this.name = name;
         this.label = label;
         this.value = value;
+        this.tooltipKeyLeft = (label != null) ? new LocTextKey(label.name + TOOLTIP_KEY_SUFFIX_LEFT) : null;
+        this.tooltipKeyRight = (label != null) ? new LocTextKey(label.name + TOOLTIP_KEY_SUFFIX_RIGHT) : null;
     }
 
     public FieldBuilder<T> withDefaultLabel(final String defaultLabel) {
@@ -56,18 +61,6 @@ public abstract class FieldBuilder<T> {
         return this;
     }
 
-    public FieldBuilder<T> withInfoLeft(final LocTextKey infoText) {
-        this.infoText = infoText;
-        this.infoLeft = true;
-        return this;
-    }
-
-    public FieldBuilder<T> withInfoRight(final LocTextKey infoText) {
-        this.infoText = infoText;
-        this.infoRight = true;
-        return this;
-    }
-
     public FieldBuilder<T> withInputSpan(final int span) {
         this.spanInput = span;
         return this;
@@ -111,23 +104,26 @@ public abstract class FieldBuilder<T> {
             final FieldBuilder<?> fieldBuilder) {
 
         final Composite infoGrid = new Composite(parent, SWT.NONE);
-        final GridLayout gridLayout = new GridLayout(2, false);
+        final GridLayout gridLayout = new GridLayout(3, false);
         gridLayout.verticalSpacing = 0;
         gridLayout.marginHeight = 0;
         gridLayout.marginWidth = 0;
         gridLayout.marginRight = 0;
         infoGrid.setLayout(gridLayout);
 
-        final GridData gridData = new GridData(SWT.LEFT, SWT.TOP, false, false);
+        final GridData gridData = new GridData(SWT.LEFT, SWT.TOP, true, false);
         infoGrid.setLayoutData(gridData);
 
-        if (fieldBuilder.infoText != null && fieldBuilder.infoLeft) {
+        if (fieldBuilder.tooltipKeyLeft != null &&
+                StringUtils.isNotBlank(builder.i18nSupport.getText(fieldBuilder.tooltipKeyLeft, ""))) {
+
             final Label info = builder.widgetFactory.imageButton(
                     WidgetFactory.ImageIcon.HELP,
                     infoGrid,
-                    fieldBuilder.infoText);
+                    fieldBuilder.tooltipKeyLeft);
             info.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
         }
+
         final Label lab = (fieldBuilder.label != null)
                 ? labelLocalized(
                         builder.widgetFactory,
@@ -138,11 +134,13 @@ public abstract class FieldBuilder<T> {
                         fieldBuilder.titleValign)
                 : null;
 
-        if (fieldBuilder.infoText != null && fieldBuilder.infoRight) {
+        if (fieldBuilder.tooltipKeyRight != null &&
+                StringUtils.isNotBlank(builder.i18nSupport.getText(fieldBuilder.tooltipKeyRight, ""))) {
+
             final Label info = builder.widgetFactory.imageButton(
                     WidgetFactory.ImageIcon.HELP,
                     infoGrid,
-                    fieldBuilder.infoText);
+                    fieldBuilder.tooltipKeyRight);
             info.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
         }
 

src/main/resources/messages.properties

@@ -144,8 +144,11 @@ sebserver.institution.form.title.new=Add Institution
 sebserver.institution.form.title=Institution
 
 sebserver.institution.form.name=Name
+sebserver.institution.form.name.tooltip.right=The display name of the institution
 sebserver.institution.form.urlSuffix=URL Suffix
+sebserver.institution.form.urlSuffix.tooltip.right=The URL suffix to the institutional login page.\n Institutional URL is: http(s)://<seb-server-name>/<suffix>
 sebserver.institution.form.logoImage=Logo Image
+sebserver.institution.form.logoImage.tooltip.right=The Image that is shown as a logo in the specified institutional login page.\nIn edit mode, use the arrow sign to open a upload dialog.
 sebserver.institution.form.logoImage.unsupportedFileType=The selected file is not supported. Supported are: PNG and JPG
 
 
@@ -517,9 +520,9 @@ sebserver.examconfig.props.form.views.hooked_keys=Hooked Keys
 sebserver.examconfig.props.label.hashedAdminPassword=Administrator password
 sebserver.examconfig.props.label.hashedAdminPassword.confirm=Confirm password
 sebserver.examconfig.props.label.allowQuit=Allow user to quit SEB
-sebserver.examconfig.props.label.allowQuit.tooltip=Users can quit SEB with Control-Q, window close or quit button. Otherwise use a quit link in your exam system or shutdown/restart the computer.
+sebserver.examconfig.props.label.allowQuit.tooltip=Users can quit SEB with Control-Q, window close or quit button.\nOtherwise use a quit link in your exam system or shutdown/restart the computer.
 sebserver.examconfig.props.label.ignoreExitKeys=Ignore exit keys
-sebserver.examconfig.props.label.ignoreExitKeys.tooltip=SEB ignores the exit keys and can only be quit manually by entering the quit password (click Quit button in SEB taskbar, press Ctrl-Q or click the main browser window close button).
+sebserver.examconfig.props.label.ignoreExitKeys.tooltip=SEB ignores the exit keys and can only be quit manually by entering the quit password.\n(click Quit button in SEB taskbar, press Ctrl-Q or click the main browser window close button)
 sebserver.examconfig.props.label.hashedQuitPassword=Quit/unlock password
 sebserver.examconfig.props.label.hashedQuitPassword.confirm=Confirm password
 sebserver.examconfig.props.group.exitSequence=Exit Sequence
@@ -559,9 +562,9 @@ sebserver.examconfig.props.label.mainBrowserWindowPositioning.2=Right
 
 sebserver.examconfig.props.group.wintoolbar=Browser Window Toolbar
 sebserver.examconfig.props.label.enableBrowserWindowToolbar=Enable browser window toolbar
-sebserver.examconfig.props.label.enableBrowserWindowToolbar.tooltip=Displays a toolbar on top of the browser window which can also be hidden by the user.
+sebserver.examconfig.props.label.enableBrowserWindowToolbar.tooltip=Displays a toolbar on top of the browser window\nwhich can also be hidden by the user.
 sebserver.examconfig.props.label.hideBrowserWindowToolbar=Hide toolbar as default (Mac)
-sebserver.examconfig.props.label.hideBrowserWindowToolbar.tooltip=Hide browser window toolbar by default. It can be unhiden using the View menu or Alt-Command-T.
+sebserver.examconfig.props.label.hideBrowserWindowToolbar.tooltip=Hide browser window toolbar by default.\nIt can be shown again by using the View menu or Alt-Command-T.
 sebserver.examconfig.props.label.showMenuBar=Show menu bar (Mac)
 sebserver.examconfig.props.label.showMenuBar.tooltip=Show the OS X menu bar to allow to access settings like Wi-Fi.
 
@@ -579,9 +582,9 @@ sebserver.examconfig.props.label.showInputLanguage.tooltip=Shows current keyboar
 
 sebserver.examconfig.props.group.zoom=Enable Zoom (Win/Mac)
 sebserver.examconfig.props.label.enableZoomPage=Enable page zoom
-sebserver.examconfig.props.label.enableZoomPage.tooltip=Pages can be zoomed with ctrl - cmd +/- or the commands in the view menu and browser window toolbar (Mac)
+sebserver.examconfig.props.label.enableZoomPage.tooltip=Pages can be zoomed with ctrl - cmd +/-\n or the commands in the view menu and browser window toolbar (Mac)
 sebserver.examconfig.props.label.enableZoomText=Enable text zoom
-sebserver.examconfig.props.label.enableZoomText.tooltip=Text in browser windows can be zoomed with cmd +/- or the commands in the view menu and browser window toolbar (Mac)
+sebserver.examconfig.props.label.enableZoomText.tooltip=Text in browser windows can be zoomed with cmd +/-\n or the commands in the view menu and browser window toolbar (Mac)
 sebserver.examconfig.props.group.zoomMode=Zoom Mode Win (Ctrl-Mousewheel)
 sebserver.examconfig.props.label.zoomMode.0=Use page zoom
 sebserver.examconfig.props.label.zoomMode.0.tooltip=Zoom whole web pages using Ctrl-Mousewheel (Win)"
@@ -617,7 +620,7 @@ sebserver.examconfig.props.label.newBrowserWindowByLinkPolicy.0=get generally bl
 sebserver.examconfig.props.label.newBrowserWindowByLinkPolicy.1=open in same window
 sebserver.examconfig.props.label.newBrowserWindowByLinkPolicy.2=open in new window
 sebserver.examconfig.props.label.newBrowserWindowByLinkBlockForeign=Block when directing\nto a different server
-sebserver.examconfig.props.label.newBrowserWindowByLinkBlockForeign.tooltip=USE WITH CARE: Hyperlinks invoked by JavaScript/plug-ins which direct to a different host than the one of the current main page will be ignored.
+sebserver.examconfig.props.label.newBrowserWindowByLinkBlockForeign.tooltip=USE WITH CARE: Hyperlinks invoked by JavaScript/plug-ins\n which direct to a different host than the one of the current main page will be ignored.
 
 sebserver.examconfig.props.group.newwinsize=New browser window size and position
 sebserver.examconfig.props.label.newBrowserWindowByLinkWidth=Width
@@ -631,19 +634,19 @@ sebserver.examconfig.props.label.newBrowserWindowByLinkPositioning.2=Right
 
 sebserver.examconfig.props.group.browserSecurity=Browser security
 sebserver.examconfig.props.label.enablePlugIns=Enable plug-ins (Win: only Flash)
-sebserver.examconfig.props.label.enablePlugIns.tooltip=Enables web plugins (Mac) or just Flash (Win). For security reasons it\'s recommended to disable this option if you don\'t use any plugin/Flash content.
+sebserver.examconfig.props.label.enablePlugIns.tooltip=Enables web plugins (Mac) or just Flash (Win).\n For security reasons it\'s recommended to disable this option if you don\'t use any plugin/Flash content.
 sebserver.examconfig.props.label.enableJavaScript=Enable JavaScript
-sebserver.examconfig.props.label.enableJavaScript.tooltip=Enables JavaScript. Please note that most modern websites need JavaScript for full functionality.
+sebserver.examconfig.props.label.enableJavaScript.tooltip=Enables JavaScript.\n Please note that most modern web-sites need JavaScript for full functionality.
 sebserver.examconfig.props.label.enableJava=Enable Java
-sebserver.examconfig.props.label.enableJava.tooltip=Enables Java applets. Note: Only applets with the highest Java security level will run in SEB.
+sebserver.examconfig.props.label.enableJava.tooltip=Enables Java applets.\n Note: Only applets with the highest Java security level will run in SEB.
 sebserver.examconfig.props.label.blockPopUpWindows=Block pop-up windows
-sebserver.examconfig.props.label.blockPopUpWindows.tooltip=Disables pop-up windows (often advertisement) opened by JavaScript without an user action such as a button click.
+sebserver.examconfig.props.label.blockPopUpWindows.tooltip=Disables pop-up windows\n (often advertisement) opened by JavaScript without an user action such as a button click.
 sebserver.examconfig.props.label.allowVideoCapture=Allow video capture (webcam)
 sebserver.examconfig.props.label.allowVideoCapture.tooltip=Allow web applications to access camera
 sebserver.examconfig.props.label.allowAudioCapture=Allow audio capture (microphone)
 sebserver.examconfig.props.label.allowAudioCapture.tooltip=Allow web applications to access microphone
 sebserver.examconfig.props.label.allowBrowsingBackForward=Allow navigating back/forward in exam
-sebserver.examconfig.props.label.allowBrowsingBackForward.tooltip=Disabling browsing to previously visited pages may increase security, because browsing back might allow to leave an exam
+sebserver.examconfig.props.label.allowBrowsingBackForward.tooltip=Disabling browsing to previously visited pages may increase security,\n because browsing back might allow to leave an exam
 sebserver.examconfig.props.label.newBrowserWindowNavigation=Allow navigating in additional windows
 sebserver.examconfig.props.label.browserWindowAllowReload=Allow reload exam
 sebserver.examconfig.props.label.browserWindowAllowReload.tooltip=Allow reload in the exam window with F5 reload button (if displayed)
@@ -656,7 +659,7 @@ sebserver.examconfig.props.label.newBrowserWindowShowReloadWarning.tooltip=User
 sebserver.examconfig.props.label.removeBrowserProfile=Remove profile (Win)
 sebserver.examconfig.props.label.removeBrowserProfile.tooltip=Remove XULRunner browser profile (containing caches and also local storage) when quitting SEB
 sebserver.examconfig.props.label.removeLocalStorage=Disable local storage (Mac)
-sebserver.examconfig.props.label.removeLocalStorage.tooltip=If your web application uses local storage, you have to be sure data is saved encrypted and removed when no longer needed as SEB doesn't remove local storage
+sebserver.examconfig.props.label.removeLocalStorage.tooltip=If your web application uses local storage, you have to be sure data is saved encrypted\n and removed when no longer needed as SEB doesn't remove local storage
 
 sebserver.examconfig.props.label.browserUserAgent=Suffix to be added to any user agent
 sebserver.examconfig.props.group.userAgentDesktop=User agent for desktop mode
@@ -682,12 +685,12 @@ sebserver.examconfig.props.label.enableSebBrowser.tooltip=Disable this to start
 sebserver.examconfig.props.label.browserWindowTitleSuffix=Suffix to be added to every browser window
 
 sebserver.examconfig.props.label.allowDownUploads=Allow downloading and uploading files (Mac)
-sebserver.examconfig.props.label.allowDownUpload.tooltip=Usually to be used with permitted third party applications for which you want to provide files to be downloaded.
+sebserver.examconfig.props.label.allowDownUpload.tooltip=Usually to be used with permitted third party applications\n for which you want to provide files to be down-loaded.
 sebserver.examconfig.props.label.downloadDirectoryWin=Download directory (Win)
 sebserver.examconfig.props.label.downloadDirectoryOSX=Download directory (Mac)
 sebserver.examconfig.props.label.openDownloads=Open files after downloading (Mac)
 sebserver.examconfig.props.label.chooseFileToUploadPolicy=Choose file to upload (Mac)
-sebserver.examconfig.props.label.chooseFileToUploadPolicy.tooltip=SEB can let users choose the file to upload or automatically use the same file which was downloaded before.\nIf not found, a file requester or an error is presented depending on this setting.
+sebserver.examconfig.props.label.chooseFileToUploadPolicy.tooltip=SEB can let users choose the file to upload or automatically use the same file which was down-loaded before.\nIf not found, a file requester or an error is presented depending on this setting.
 sebserver.examconfig.props.label.chooseFileToUploadPolicy.0=manually with file requester
 sebserver.examconfig.props.label.chooseFileToUploadPolicy.1=by attempting to upload the same file downloaded before
 sebserver.examconfig.props.label.chooseFileToUploadPolicy.2=by only allowing to upload the same file downloaded before
@@ -725,11 +728,11 @@ sebserver.examconfig.props.label.permittedProcesses.os.tooltip=Indicates on whic
 sebserver.examconfig.props.label.permittedProcesses.os.0=OS X
 sebserver.examconfig.props.label.permittedProcesses.os.1=Win
 sebserver.examconfig.props.label.permittedProcesses.title=Title
-sebserver.examconfig.props.label.permittedProcesses.title.tooltip=Application title which is displayed in the application chooser. Background processes don't have a title, because they can't be selected by users.
+sebserver.examconfig.props.label.permittedProcesses.title.tooltip=Application title which is displayed in the application chooser.\n Background processes don't have a title, because they can't be selected by users.
 sebserver.examconfig.props.label.permittedProcesses.description=Description
-sebserver.examconfig.props.label.permittedProcesses.description.tooltip=Optional, should explain what kind of process this is, because this might not be obvious only from the executable's name.
+sebserver.examconfig.props.label.permittedProcesses.description.tooltip=Optional, should explain what kind of process this is,\n because this might not be obvious only from the executable's name.
 sebserver.examconfig.props.label.permittedProcesses.executable=Executable
-sebserver.examconfig.props.label.permittedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path, only the filename of the exe file (like calc.exe).
+sebserver.examconfig.props.label.permittedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path,\n only the filename of the exe file (like calc.exe).
 sebserver.examconfig.props.label.permittedProcesses.originalName=Original Name
 sebserver.examconfig.props.label.permittedProcesses.allowedExecutables=Window handling process
 sebserver.examconfig.props.label.permittedProcesses.path=Path
@@ -741,11 +744,11 @@ sebserver.examconfig.props.label.permittedProcesses.arguments.removeAction=Remov
 sebserver.examconfig.props.label.permittedProcesses.identifier=Identifier
 sebserver.examconfig.props.label.permittedProcesses.identifier.tooltip=(Sub) string in the title of the main window of a tricky third party application (Java, Acrobat etc.).\n Mac OS X: Bundle identifier of the process in reverse domain notation.
 sebserver.examconfig.props.label.permittedProcesses.iconInTaskbar=Icon in taskbar
-sebserver.examconfig.props.label.permittedProcesses.iconInTaskbar.tooltip=Show icon of permitted application in task bar (not possible when 'run in background' is enabled).
+sebserver.examconfig.props.label.permittedProcesses.iconInTaskbar.tooltip=Show icon of permitted application in task bar\n (not possible when 'run in background' is enabled).
 sebserver.examconfig.props.label.permittedProcesses.autostart=Autostart
 sebserver.examconfig.props.label.permittedProcesses.autostart.tooltip=Start the process automatically together with SEB.
 sebserver.examconfig.props.label.permittedProcesses.runInBackground=Allow running in background
-sebserver.examconfig.props.label.permittedProcesses.runInBackground.tooltip=Allow the permitted process to already be running when SEB starts. Such a process can't have an icon in the task bar.
+sebserver.examconfig.props.label.permittedProcesses.runInBackground.tooltip=Allow the permitted process to already be running when SEB starts.\n Such a process can't have an icon in the task bar.
 sebserver.examconfig.props.label.permittedProcesses.allowUserToChooseApp=Allow user to select location of application
 sebserver.examconfig.props.label.permittedProcesses.strongKill=Force quit (risk of data loss)
 sebserver.examconfig.props.label.permittedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
@@ -760,15 +763,15 @@ sebserver.examconfig.props.label.prohibitedProcesses.os=OS
 sebserver.examconfig.props.label.prohibitedProcesses.os.0=OS X
 sebserver.examconfig.props.label.prohibitedProcesses.os.1=Win
 sebserver.examconfig.props.label.prohibitedProcesses.description=Description
-sebserver.examconfig.props.label.prohibitedProcesses.description.tooltip=Optional, to explain what kind of process this is, because this might not be obvious only from the executable's name.
+sebserver.examconfig.props.label.prohibitedProcesses.description.tooltip=Optional, to explain what kind of process this is,\n because this might not be obvious only from the executable's name.
 sebserver.examconfig.props.label.prohibitedProcesses.executable=Executable
-sebserver.examconfig.props.label.prohibitedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path, only the filename of the exe file (like calc.exe).
+sebserver.examconfig.props.label.prohibitedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path,\n only the filename of the exe file (like calc.exe).
 sebserver.examconfig.props.label.prohibitedProcesses.originalName=Original Name
 sebserver.examconfig.props.label.prohibitedProcesses.originalName.tooltip=Original file name (optional)
 sebserver.examconfig.props.label.prohibitedProcesses.identifier=Identifier
-sebserver.examconfig.props.label.prohibitedProcesses.identifier.tooltip=Title of the main window of a Java third party application. Mac OS X: Bundle identifier of the process in reverse domain notation.
+sebserver.examconfig.props.label.prohibitedProcesses.identifier.tooltip=Title of the main window of a Java third party application.\n Mac OS X: Bundle identifier of the process in reverse domain notation.
 sebserver.examconfig.props.label.prohibitedProcesses.strongKill=Force quit (risk of data loss)
-sebserver.examconfig.props.label.prohibitedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
+sebserver.examconfig.props.label.prohibitedProcesses.strongKill.tooltip=Terminate process in a not-nice way,\n which may cause data loss if the application had unsaved data
 
 sebserver.examconfig.props.group.urlFilter=Filter
 sebserver.examconfig.props.label.URLFilterEnable=Activate URL Filtering

src/main/resources/static/css/sebserver.css

@@ -724,7 +724,7 @@ TabItem:selected:hover:first {
 
 
 Widget-ToolTip {
-    padding: 1px 3px 2px 3px;
+    padding: 10px 5px 10px 5px;
     background-color: #82be1e;
     border: 1px solid #3C5A0F;
     border-radius: 2px 2px 2px 2px;