You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2014/05/07 09:36:35 UTC
svn commit: r1592942 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/panels/ webapp/css/
Author: andreapatricelli
Date: Wed May 7 07:36:35 2014
New Revision: 1592942
URL: http://svn.apache.org/r1592942
Log:
[SYNCOPE-480] Undoing unwanted formatting changes
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
syncope/trunk/console/src/main/webapp/css/style.css
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Wed May 7 07:36:35 2014
@@ -159,8 +159,8 @@ public class Configuration extends BaseP
workflowDefContainer.setVisible(false);
}
- BookmarkablePageLink<Void> activitiModeler
- = new BookmarkablePageLink<Void>("activitiModeler", ActivitiModelerPopupPage.class);
+ BookmarkablePageLink<Void> activitiModeler =
+ new BookmarkablePageLink<Void>("activitiModeler", ActivitiModelerPopupPage.class);
activitiModeler.setPopupSettings(new VeilPopupSettings().setHeight(600).setWidth(800));
MetaDataRoleAuthorizationStrategy.authorize(activitiModeler, ENABLE,
xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefRead"));
@@ -177,8 +177,8 @@ public class Configuration extends BaseP
}
activitiModeler.setEnabled(activitiModelerEnabled);
- BookmarkablePageLink<Void> xmlEditor
- = new BookmarkablePageLink<Void>("xmlEditor", XMLEditorPopupPage.class);
+ BookmarkablePageLink<Void> xmlEditor =
+ new BookmarkablePageLink<Void>("xmlEditor", XMLEditorPopupPage.class);
xmlEditor.setPopupSettings(new VeilPopupSettings().setHeight(350).setWidth(800));
MetaDataRoleAuthorizationStrategy.authorize(xmlEditor, ENABLE,
xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefRead"));
@@ -211,8 +211,8 @@ public class Configuration extends BaseP
add(workflowDefContainer);
// Logger stuff
- PropertyListView<LoggerTO> coreLoggerList
- = new LoggerPropertyList(null, "corelogger", loggerRestClient.listLogs());
+ PropertyListView<LoggerTO> coreLoggerList =
+ new LoggerPropertyList(null, "corelogger", loggerRestClient.listLogs());
WebMarkupContainer coreLoggerContainer = new WebMarkupContainer("coreLoggerContainer");
coreLoggerContainer.add(coreLoggerList);
coreLoggerContainer.setOutputMarkupId(true);
@@ -222,8 +222,8 @@ public class Configuration extends BaseP
add(coreLoggerContainer);
ConsoleLoggerController consoleLoggerController = new ConsoleLoggerController();
- PropertyListView<LoggerTO> consoleLoggerList
- = new LoggerPropertyList(consoleLoggerController, "consolelogger", consoleLoggerController.getLoggers());
+ PropertyListView<LoggerTO> consoleLoggerList =
+ new LoggerPropertyList(consoleLoggerController, "consolelogger", consoleLoggerController.getLoggers());
WebMarkupContainer consoleLoggerContainer = new WebMarkupContainer("consoleLoggerContainer");
consoleLoggerContainer.add(consoleLoggerList);
consoleLoggerContainer.setOutputMarkupId(true);
@@ -304,8 +304,8 @@ public class Configuration extends BaseP
}
});
- final AjaxFallbackDefaultDataTable<ConfigurationTO, String> confTable
- = new AjaxFallbackDefaultDataTable<ConfigurationTO, String>(
+ final AjaxFallbackDefaultDataTable<ConfigurationTO, String> confTable =
+ new AjaxFallbackDefaultDataTable<ConfigurationTO, String>(
"syncopeconf", confColumns, new SyncopeConfProvider(), confPaginatorRows);
confContainer = new WebMarkupContainer("confContainer");
@@ -380,7 +380,7 @@ public class Configuration extends BaseP
@SuppressWarnings("rawtypes")
Form confPaginatorForm = new Form("confPaginatorForm");
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
new PropertyModel(this, "confPaginatorRows"), prefMan.getPaginatorChoices());
@@ -480,8 +480,8 @@ public class Configuration extends BaseP
}
});
- final AjaxFallbackDefaultDataTable<NotificationTO, String> notificationTable
- = new AjaxFallbackDefaultDataTable<NotificationTO, String>(
+ final AjaxFallbackDefaultDataTable<NotificationTO, String> notificationTable =
+ new AjaxFallbackDefaultDataTable<NotificationTO, String>(
"notificationTable", notificationCols, new NotificationProvider(), notificationPaginatorRows);
notificationContainer = new WebMarkupContainer("notificationContainer");
@@ -532,7 +532,7 @@ public class Configuration extends BaseP
@SuppressWarnings("rawtypes")
Form notificationPaginatorForm = new Form("notificationPaginatorForm");
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
"notificationPaginatorRows"), prefMan.getPaginatorChoices());
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java Wed May 7 07:36:35 2014
@@ -58,8 +58,8 @@ public class ConfigurationModalPage exte
public ConfigurationModalPage(final PageReference pageRef, final ModalWindow window,
final ConfigurationTO configurationTO, final boolean createFlag) {
- Form<ConfigurationTO> form
- = new Form<ConfigurationTO>(FORM, new CompoundPropertyModel<ConfigurationTO>(configurationTO));
+ Form<ConfigurationTO> form =
+ new Form<ConfigurationTO>(FORM, new CompoundPropertyModel<ConfigurationTO>(configurationTO));
final AjaxTextFieldPanel key = new AjaxTextFieldPanel("key", "key",
new PropertyModel<String>(configurationTO, "key"));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Wed May 7 07:36:35 2014
@@ -81,7 +81,7 @@ public class Login extends WebPage {
private TextField<String> passwordField;
private DropDownChoice<Locale> languageSelect;
-
+
private final NotificationPanel feedbackPanel;
public Login(final PageParameters parameters) {
@@ -89,7 +89,7 @@ public class Login extends WebPage {
feedbackPanel = new NotificationPanel(Constants.FEEDBACK);
add(feedbackPanel);
-
+
form = new Form<Void>("login");
userIdField = new TextField<String>("userId", new Model<String>());
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Wed May 7 07:36:35 2014
@@ -111,17 +111,17 @@ public class PolicyModalPage<T extends A
switch (policyTO.getType()) {
case GLOBAL_ACCOUNT:
case ACCOUNT:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_ACCOUNT, PolicyType.ACCOUNT}));
+ type.setChoices(Arrays.asList(new PolicyType[] { PolicyType.GLOBAL_ACCOUNT, PolicyType.ACCOUNT }));
break;
case GLOBAL_PASSWORD:
case PASSWORD:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_PASSWORD, PolicyType.PASSWORD}));
+ type.setChoices(Arrays.asList(new PolicyType[] { PolicyType.GLOBAL_PASSWORD, PolicyType.PASSWORD }));
break;
case GLOBAL_SYNC:
case SYNC:
- type.setChoices(Arrays.asList(new PolicyType[]{PolicyType.GLOBAL_SYNC, PolicyType.SYNC}));
+ type.setChoices(Arrays.asList(new PolicyType[] { PolicyType.GLOBAL_SYNC, PolicyType.SYNC }));
default:
}
@@ -219,8 +219,8 @@ public class PolicyModalPage<T extends A
return new Model<String>(object);
}
};
- final AjaxFallbackDefaultDataTable<String, String> resources
- = new AjaxFallbackDefaultDataTable<String, String>("resources", resColumns, resDataProvider, 10);
+ final AjaxFallbackDefaultDataTable<String, String> resources =
+ new AjaxFallbackDefaultDataTable<String, String>("resources", resColumns, resDataProvider, 10);
form.add(resources);
List<IColumn<RoleTO, String>> roleColumns = new ArrayList<IColumn<RoleTO, String>>();
@@ -297,8 +297,8 @@ public class PolicyModalPage<T extends A
return new Model<RoleTO>(object);
}
};
- final AjaxFallbackDefaultDataTable<RoleTO, String> roles
- = new AjaxFallbackDefaultDataTable<RoleTO, String>("roles", roleColumns, roleDataProvider, 10);
+ final AjaxFallbackDefaultDataTable<RoleTO, String> roles =
+ new AjaxFallbackDefaultDataTable<RoleTO, String>("roles", roleColumns, roleDataProvider, 10);
form.add(roles);
mwindow.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Wed May 7 07:36:35 2014
@@ -101,8 +101,8 @@ public class Roles extends BasePage {
}
});
- final AbstractSearchResultPanel searchResult
- = new RoleSearchResultPanel("searchResult", true, null, getPageReference(), restClient);
+ final AbstractSearchResultPanel searchResult =
+ new RoleSearchResultPanel("searchResult", true, null, getPageReference(), restClient);
add(searchResult);
final Form searchForm = new Form("searchForm");
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Wed May 7 07:36:35 2014
@@ -79,7 +79,7 @@ import org.springframework.util.Reflecti
/**
* Schema WebPage.
*/
-@SuppressWarnings({"unchecked", "rawtypes"})
+@SuppressWarnings({ "unchecked", "rawtypes" })
public class Schema extends BasePage {
private static final long serialVersionUID = 8091922398776299403L;
@@ -89,41 +89,41 @@ public class Schema extends BasePage {
private static final long serialVersionUID = 3109256773218160485L;
{
- put(SchemaType.NORMAL, Arrays.asList(new String[] {"name", "type",
- "mandatoryCondition", "uniqueConstraint", "multivalue", "readonly"}));
- put(SchemaType.DERIVED, Arrays.asList(new String[] {"name", "expression"}));
- put(SchemaType.VIRTUAL, Arrays.asList(new String[] {"name", "readonly"}));
+ put(SchemaType.NORMAL, Arrays.asList(new String[] { "name", "type",
+ "mandatoryCondition", "uniqueConstraint", "multivalue", "readonly" }));
+ put(SchemaType.DERIVED, Arrays.asList(new String[] { "name", "expression" }));
+ put(SchemaType.VIRTUAL, Arrays.asList(new String[] { "name", "readonly" }));
}
};
private static final Map<Map.Entry<AttributableType, SchemaType>, String> PAGINATOR_ROWS_KEYS =
new HashMap<Map.Entry<AttributableType, SchemaType>, String>() {
- private static final long serialVersionUID = 3109256773218160485L;
+ private static final long serialVersionUID = 3109256773218160485L;
- {
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.NORMAL),
- Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.DERIVED),
- Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.VIRTUAL),
- Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP, SchemaType.NORMAL),
- Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
- SchemaType.DERIVED),
- Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
- SchemaType.VIRTUAL),
- Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.NORMAL),
- Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.DERIVED),
- Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
- put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.VIRTUAL),
- Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
- }
- };
+ {
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.NORMAL),
+ Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.DERIVED),
+ Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.VIRTUAL),
+ Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP, SchemaType.NORMAL),
+ Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
+ SchemaType.DERIVED),
+ Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.MEMBERSHIP,
+ SchemaType.VIRTUAL),
+ Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.NORMAL),
+ Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.DERIVED),
+ Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
+ put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.ROLE, SchemaType.VIRTUAL),
+ Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
+ }
+ };
private static final int WIN_WIDTH = 600;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Wed May 7 07:36:35 2014
@@ -175,7 +175,7 @@ public abstract class TaskModalPage exte
if (target != null) {
final AjaxFallbackDefaultDataTable<TaskExecTO, String> currentTable =
new AjaxFallbackDefaultDataTable<TaskExecTO, String>("executionsTable", columns,
- new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
currentTable.setOutputMarkupId(true);
target.add(currentTable);
executions.addOrReplace(currentTable);
@@ -189,7 +189,7 @@ public abstract class TaskModalPage exte
final AjaxFallbackDefaultDataTable<TaskExecTO, String> table =
new AjaxFallbackDefaultDataTable<TaskExecTO, String>("executionsTable", columns,
- new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
+ new TaskExecutionsProvider(getCurrentTaskExecution(taskTO)), paginatorRows);
executions.add(table);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/XMLEditorPopupPage.java Wed May 7 07:36:35 2014
@@ -54,8 +54,8 @@ public class XMLEditorPopupPage extends
final TextArea<String> workflowDefArea = new TextArea<String>("workflowDefArea", new Model<String>(definition));
wfForm.add(workflowDefArea);
- AjaxButton submit
- = new ClearIndicatingAjaxButton(APPLY, new Model<String>(getString(SUBMIT)), getPageReference()) {
+ AjaxButton submit =
+ new ClearIndicatingAjaxButton(APPLY, new Model<String>(getString(SUBMIT)), getPageReference()) {
private static final long serialVersionUID = -958724007591692537L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java Wed May 7 07:36:35 2014
@@ -107,25 +107,26 @@ public abstract class AbstractSearchPane
searchFormContainer = new WebMarkupContainer("searchFormContainer");
searchFormContainer.setOutputMarkupId(true);
- searchFeedback = new NotificationPanel("searchFeedback", "notificationpanel_top_right", new IFeedbackMessageFilter() {
+ searchFeedback = new NotificationPanel("searchFeedback", "notificationpanel_top_right",
+ new IFeedbackMessageFilter() {
- private static final long serialVersionUID = 6895024863321391672L;
+ private static final long serialVersionUID = 6895024863321391672L;
- @Override
- public boolean accept(final FeedbackMessage message) {
- boolean result;
-
- // messages reported on the session have a null reporter
- if (message.getReporter() == null) {
- result = false;
- } else {
- // only accept messages coming from the children of the search form container
- result = searchFormContainer.contains(message.getReporter(), true);
- }
+ @Override
+ public boolean accept(final FeedbackMessage message) {
+ boolean result;
+
+ // messages reported on the session have a null reporter
+ if (message.getReporter() == null) {
+ result = false;
+ } else {
+ // only accept messages coming from the children of the search form container
+ result = searchFormContainer.contains(message.getReporter(), true);
+ }
- return result;
- }
- });
+ return result;
+ }
+ });
searchFeedback.setOutputMarkupId(true);
add(searchFeedback);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java Wed May 7 07:36:35 2014
@@ -49,8 +49,8 @@ public class NotificationPanel extends F
init(id, additionalCSSClass);
}
- public NotificationPanel(final String id, final String additionalCSSClass, final IFeedbackMessageFilter
- feedbackMessageFilter) {
+ public NotificationPanel(final String id, final String additionalCSSClass,
+ final IFeedbackMessageFilter feedbackMessageFilter) {
super(id, feedbackMessageFilter);
this.additionalCSSClass = additionalCSSClass;
@@ -106,6 +106,7 @@ public class NotificationPanel extends F
/**
* Returns css class for the single rows of the panel
+ *
* @param message
*/
@Override
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Wed May 7 07:36:35 2014
@@ -17,40 +17,40 @@ specific language governing permissions
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head>
- <title></title>
+ <head>
+ <title></title>
- <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" media="all"/>
-
- <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
-
- <script type="text/javascript">
- $(function() {
- $("#tabs").tabs();
- });
-
- var notificationShowedTimes = 0;
-
- function showNotification(componentId, messagecount) {
- notificationShowedTimes++;
- timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
- $('div#' + componentId).fadeTo('normal', 1.0);
- setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
- }
- </script>
-
- <style type="text/css">
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
- </style>
- </head>
- <body onload="setTimeout('window.focus();', 0);">
- <div wicket:id="feedback"/>
+ <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" media="all"/>
+
+ <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
+
+ <script type="text/javascript">
+ $(function() {
+ $("#tabs").tabs();
+ });
+
+ var notificationShowedTimes = 0;
+
+ function showNotification(componentId, messagecount) {
+ notificationShowedTimes++;
+ timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
+ $('div#' + componentId).fadeTo('normal', 1.0);
+ setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
+ }
+ </script>
+
+ <style type="text/css">
+ table.palette td.header {
+ background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
+ repeat-x scroll 50% 50% #E6E6E6 !important;
+ }
+ </style>
+ </head>
+ <body onload="setTimeout('window.focus();', 0);">
+ <div wicket:id="feedback"/>
- <wicket:child />
- </body>
+ <wicket:child />
+ </body>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Wed May 7 07:36:35 2014
@@ -18,128 +18,128 @@ specific language governing permissions
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Style-Type" content="text/css"/>
- <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-
- <title>Apache Syncope</title>
-
- <link rel="shortcut icon" href="img/favicon.ico" />
-
- <style type="text/css">
- div.wicket-modal div.w_caption {
- height: 16px !important;
- }
- </style>
- <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
-
- <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
-
- <script type="text/javascript">
- $(document).ready(function() {
- $("#tabs").tabs();
- });
-
- /** Add rollover effect to tables supporting Ajax events */
- $(document).on('mouseover mouseout', 'table.ui-widget.ui-widget-content.table-hover tbody tr',
- function(event) {
- if (event.type == 'mouseover') {
- $(this).addClass('selectedRow');
- } else if (event.type == 'mouseout') {
- $(this).removeClass('selectedRow');
- }
- });
-
- var notificationShowedTimes = 0;
-
- function showNotification(componentId, messagecount) {
- notificationShowedTimes++;
- timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
- $('div#' + componentId).fadeTo('normal', 1.0);
- setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
- }
- </script>
- </head>
- <body>
- <div id="navigationPane">
- <ul>
- <li style="position: absolute; left: 0px; top: 10px;width:240px;">
- <img src="img/logo.png" alt="logo"/><br />
- </li>
- <li><span>
- <a href="#" wicket:id="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br />
- <wicket:message key="todo"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br />
- <wicket:message key="schema"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br />
- <wicket:message key="users"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br />
- <wicket:message key="roles"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br />
- <wicket:message key="resources"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br />
- <wicket:message key="tasks"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br />
- <wicket:message key="reports"/>
- </a>
- </span>
- </li>
- <li><span>
- <a href="#" wicket:id="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br />
- <wicket:message key="configuration"/>
- </a></span>
- </li>
- <li style="float:right;width:auto;text-align:right;">
- <a href="#" wicket:id="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /></a>
- <div style="display: table-row;">
- <div id="username" style="padding-right: 5px;width: 100px;cursor: pointer;display: table-cell;">
- <a href="#" wicket:id="editProfileLink">
- <span wicket:id="username" style="color: #B9CFB3;font-family: monospace;"/>
- </a>
- </div>
- <div>
- <div wicket:id="infoModal"/>
- <a wicket:id="infoLink" style="vertical-align: middle;"><img src="img/info.png" alt="info" style="padding-right: 10px;"/></a>
- </div>
- </div>
- </li>
- </ul>
- <div wicket:id="editProfileModal"></div>
- </div>
-
- <div wicket:id="feedback"/>
-
- <wicket:child />
-
- <div id="veil" style="display:none;position:absolute;top:0;left:0;z-index:99999;background-color:black;width:100%;height:20000px;color:white;opacity:0.3;filter:alpha(opacity=30);">
- <img src="img/busy.gif" style="position:absolute;top:300px;left:50%;margin-left:-75px;width:150px;"/>
- </div>
- </body>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Style-Type" content="text/css"/>
+ <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+
+ <title>Apache Syncope</title>
+
+ <link rel="shortcut icon" href="img/favicon.ico" />
+
+ <style type="text/css">
+ div.wicket-modal div.w_caption {
+ height: 16px !important;
+ }
+ </style>
+ <link rel="stylesheet" type="text/css" href="webjars/jquery-ui/${jquery-ui.version}/themes/base/minified/jquery-ui.min.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
+
+ <script type="text/javascript" src="webjars/jquery-ui/${jquery-ui.version}/ui/minified/jquery-ui.min.js"></script>
+
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#tabs").tabs();
+ });
+
+ /** Add rollover effect to tables supporting Ajax events */
+ $(document).on('mouseover mouseout', 'table.ui-widget.ui-widget-content.table-hover tbody tr',
+ function(event) {
+ if (event.type == 'mouseover') {
+ $(this).addClass('selectedRow');
+ } else if (event.type == 'mouseout') {
+ $(this).removeClass('selectedRow');
+ }
+ });
+
+ var notificationShowedTimes = 0;
+
+ function showNotification(componentId, messagecount) {
+ notificationShowedTimes++;
+ timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
+ $('div#' + componentId).fadeTo('normal', 1.0);
+ setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
+ }
+ </script>
+ </head>
+ <body>
+ <div id="navigationPane">
+ <ul>
+ <li style="position: absolute; left: 0px; top: 10px;width:240px;">
+ <img src="img/logo.png" alt="logo"/><br />
+ </li>
+ <li><span>
+ <a href="#" wicket:id="todo"><img wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br />
+ <wicket:message key="todo"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="schema"><img wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br />
+ <wicket:message key="schema"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="users"><img wicket:id="usersIcon" alt="Users" width="80" height="80" /><br />
+ <wicket:message key="users"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="roles"><img wicket:id="rolesIcon" alt="Roles" width="80" height="80" /><br />
+ <wicket:message key="roles"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="resources"><img wicket:id="resourcesIcon" alt="Resources" width="80" height="80" /><br />
+ <wicket:message key="resources"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="tasks"><img wicket:id="tasksIcon" alt="Tasks" width="80" height="80" /><br />
+ <wicket:message key="tasks"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="reports"><img wicket:id="reportsIcon" alt="Reports" width="80" height="80" /><br />
+ <wicket:message key="reports"/>
+ </a>
+ </span>
+ </li>
+ <li><span>
+ <a href="#" wicket:id="configuration"><img wicket:id="configurationIcon" alt="Configuration" width="80" height="80" /><br />
+ <wicket:message key="configuration"/>
+ </a></span>
+ </li>
+ <li style="float:right;width:auto;text-align:right;">
+ <a href="#" wicket:id="logout"><img src="img/menu/logout.png" alt="Logout" width="80" height="80" /><br /></a>
+ <div style="display: table-row;">
+ <div id="username" style="padding-right: 5px;width: 100px;cursor: pointer;display: table-cell;">
+ <a href="#" wicket:id="editProfileLink">
+ <span wicket:id="username" style="color: #B9CFB3;font-family: monospace;"/>
+ </a>
+ </div>
+ <div>
+ <div wicket:id="infoModal"/>
+ <a wicket:id="infoLink" style="vertical-align: middle;"><img src="img/info.png" alt="info" style="padding-right: 10px;"/></a>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <div wicket:id="editProfileModal"></div>
+ </div>
+
+ <div wicket:id="feedback"/>
+
+ <wicket:child />
+
+ <div id="veil" style="display:none;position:absolute;top:0;left:0;z-index:99999;background-color:black;width:100%;height:20000px;color:white;opacity:0.3;filter:alpha(opacity=30);">
+ <img src="img/busy.gif" style="position:absolute;top:300px;left:50%;margin-left:-75px;width:150px;"/>
+ </div>
+ </body>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html Wed May 7 07:36:35 2014
@@ -18,61 +18,61 @@ specific language governing permissions
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Style-Type" content="text/css"/>
-
- <title>Apache Syncope - Login</title>
-
- <link rel="shortcut icon" href="img/favicon.ico"/>
- <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
-
- <script type="text/javascript">
-
- var notificationShowedTimes = 0;
-
- function showNotification(componentId, messagecount) {
- notificationShowedTimes++;
- timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
- $('div#' + componentId).fadeTo('normal', 1.0);
- setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
- }
- </script>
-
- </head>
- <body style="text-align:center">
- <div id="splash">
- <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
- <p style="border: none"> </p>
- <div id="loginFeedbackDiv">
- <div wicket:id="feedback">feedbackmessages will be put here</div>
- </div>
- <form wicket:id="login">
- <label for="userId">
- <wicket:message key="userId"/>
- </label>
- <input type="text" wicket:id="userId" id="userId" size="25" style="width: 180px" />
- <br />
- <label for="password" class="password">
- <wicket:message key="password"/>
- </label>
- <input type="password" wicket:id="password" id="password" size="25" style="width: 180px" />
- <br />
- <select wicket:id="language" id="language"/>
- <br />
- <br />
- <input type="submit" wicket:id="submit"/>
- </form>
-
- <span style="display: inline-table; margin-bottom: 10px;" wicket:id="selfRegistration"/>
-
- <wicket:fragment wicket:id="selfRegNotAllowed"/>
- <wicket:fragment wicket:id="selfRegAllowed">
- <span wicket:id="selfRegistration"/>
- </wicket:fragment>
-
- <div wicket:id="selfRegModal"></div>
- </div>
- </body>
+ <head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Style-Type" content="text/css"/>
+
+ <title>Apache Syncope - Login</title>
+
+ <link rel="shortcut icon" href="img/favicon.ico"/>
+ <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
+
+ <script type="text/javascript">
+
+ var notificationShowedTimes = 0;
+
+ function showNotification(componentId, messagecount) {
+ notificationShowedTimes++;
+ timeout = 1700 + (messagecount * 500) + notificationShowedTimes * 200;
+ $('div#' + componentId).fadeTo('normal', 1.0);
+ setTimeout("$('div#" + componentId + "').fadeOut('normal')", timeout);
+ }
+ </script>
+
+ </head>
+ <body style="text-align:center">
+ <div id="splash">
+ <img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
+ <p style="border: none"> </p>
+ <div id="loginFeedbackDiv">
+ <div wicket:id="feedback">feedbackmessages will be put here</div>
+ </div>
+ <form wicket:id="login">
+ <label for="userId">
+ <wicket:message key="userId"/>
+ </label>
+ <input type="text" wicket:id="userId" id="userId" size="25" style="width: 180px" />
+ <br />
+ <label for="password" class="password">
+ <wicket:message key="password"/>
+ </label>
+ <input type="password" wicket:id="password" id="password" size="25" style="width: 180px" />
+ <br />
+ <select wicket:id="language" id="language"/>
+ <br />
+ <br />
+ <input type="submit" wicket:id="submit"/>
+ </form>
+
+ <span style="display: inline-table; margin-bottom: 10px;" wicket:id="selfRegistration"/>
+
+ <wicket:fragment wicket:id="selfRegNotAllowed"/>
+ <wicket:fragment wicket:id="selfRegAllowed">
+ <span wicket:id="selfRegistration"/>
+ </wicket:fragment>
+
+ <div wicket:id="selfRegModal"></div>
+ </div>
+ </body>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html Wed May 7 07:36:35 2014
@@ -17,64 +17,64 @@ specific language governing permissions
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:head>
- <style>
- div.role-tree div.wicket-tree-table a {
- color:black;
- }
- </style>
- <script type="text/javascript">
- $(document).ready(function() {
- $("#roletabs").tabs();
- });
- </script>
- </wicket:head>
- <wicket:extend>
- <div id="roletabs">
- <ul>
- <li class="tabs-selected">
- <a href="#tabs-tree">
- <span><wicket:message key="tabs-tree"/>
- </span>
- </a>
- </li>
- <li>
- <a href="#tabs-search">
- <span><wicket:message key="tabs-search"/>
- </span>
- </a>
- </li>
- </ul>
-
- <div id="tabs-tree" >
- <div wicket:id="roleTabsContainer">
- <span wicket:id="treePanel"></span>
- <span wicket:id="summaryPanel"></span>
- </div>
- <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
- </div>
-
- <div id="tabs-search">
- <div>
- <form wicket:id="searchForm">
- <span wicket:id="searchPanel">searchPanel</span>
-
- <br/>
- <a wicket:id="search"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
- <img src="img/search.png" alt="search"/>
- <wicket:message key="search"/>
- </a>
- </form>
- </div>
-
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="searchResult">[search result]</span>
- </div>
- </div>
+ <wicket:head>
+ <style>
+ div.role-tree div.wicket-tree-table a {
+ color:black;
+ }
+ </style>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#roletabs").tabs();
+ });
+ </script>
+ </wicket:head>
+ <wicket:extend>
+ <div id="roletabs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#tabs-tree">
+ <span><wicket:message key="tabs-tree"/>
+ </span>
+ </a>
+ </li>
+ <li>
+ <a href="#tabs-search">
+ <span><wicket:message key="tabs-search"/>
+ </span>
+ </a>
+ </li>
+ </ul>
+
+ <div id="tabs-tree" >
+ <div wicket:id="roleTabsContainer">
+ <span wicket:id="treePanel"></span>
+ <span wicket:id="summaryPanel"></span>
+ </div>
+ <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
+ </div>
+
+ <div id="tabs-search">
+ <div>
+ <form wicket:id="searchForm">
+ <span wicket:id="searchPanel">searchPanel</span>
+
+ <br/>
+ <a wicket:id="search"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <img src="img/search.png" alt="search"/>
+ <wicket:message key="search"/>
+ </a>
+ </form>
+ </div>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="searchResult">[search result]</span>
</div>
+ </div>
+
+ </div>
- <wicket:child/>
- </wicket:extend>
+ <wicket:child/>
+ </wicket:extend>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html Wed May 7 07:36:35 2014
@@ -49,10 +49,10 @@ under the License.
</div>
</form>
<script>
- window.onload = function(){
- var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),{lineNumbers: true});
- editor.on("change", updateTextArea);
- }
+ window.onload = function() {
+ var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"), {lineNumbers: true});
+ editor.on("change", updateTextArea);
+ }
</script>
</wicket:extend>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel.html Wed May 7 07:36:35 2014
@@ -17,48 +17,48 @@ specific language governing permissions
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:panel>
- <div style="float:left; width:70%;">
- <script type="text/javascript">
- $(document).ready(function() {
- $("div form #tabs").tabs();
- });
- $(document).ready(function() {
- $("div form #tabs #templates").tabs();
- });
- </script>
- <p style="height:15px; margin-top: 0px;" class="ui-widget ui-corner-all ui-widget-header">
- <wicket:message key="title"/>
- <span wicket:id="displayName"/>
- <span style="float:right;" wicket:id="actionLinks"/>
- </p>
+ <wicket:panel>
+ <div style="float:left; width:70%;">
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("div form #tabs").tabs();
+ });
+ $(document).ready(function() {
+ $("div form #tabs #templates").tabs();
+ });
+ </script>
+ <p style="height:15px; margin-top: 0px;" class="ui-widget ui-corner-all ui-widget-header">
+ <wicket:message key="title"/>
+ <span wicket:id="displayName"/>
+ <span style="float:right;" wicket:id="actionLinks"/>
+ </p>
- <form wicket:id="roleForm">
- <div id="tabs" style="margin: 0px;">
- <ul>
- <li><a href="#details"><span><wicket:message key="details"/></span></a></li>
- <li><a href="#templates"><span><wicket:message key="templates"/></span></a></li>
- <li><a href="#attrs"><span><wicket:message key="attrs"/></span></a></li>
- <li><a href="#derAttrs"><span><wicket:message key="derAttrs"/></span></a></li>
- <li><a href="#virAttrs"><span><wicket:message key="virAttrs"/></span></a></li>
- <li><a href="#resources"><span><wicket:message key="resources"/></span></a></li>
- <li><a href="#entitlements"><span><wicket:message key="entitlements"/></span></a></li>
- <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
- <li><a href="#users"><span><wicket:message key="users"/></span></a></li>
- </ul>
- <div wicket:id="rolePanel">
- </div>
- <div id="users">
- <div wicket:id="userListContainer">
- <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="search"/>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="userList"> [userList] </span>
- </div>
- </div>
- </div>
- </div>
- </form>
+ <form wicket:id="roleForm">
+ <div id="tabs" style="margin: 0px;">
+ <ul>
+ <li><a href="#details"><span><wicket:message key="details"/></span></a></li>
+ <li><a href="#templates"><span><wicket:message key="templates"/></span></a></li>
+ <li><a href="#attrs"><span><wicket:message key="attrs"/></span></a></li>
+ <li><a href="#derAttrs"><span><wicket:message key="derAttrs"/></span></a></li>
+ <li><a href="#virAttrs"><span><wicket:message key="virAttrs"/></span></a></li>
+ <li><a href="#resources"><span><wicket:message key="resources"/></span></a></li>
+ <li><a href="#entitlements"><span><wicket:message key="entitlements"/></span></a></li>
+ <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
+ <li><a href="#users"><span><wicket:message key="users"/></span></a></li>
+ </ul>
+ <div wicket:id="rolePanel">
+ </div>
+ <div id="users">
+ <div wicket:id="userListContainer">
+ <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="search"/>
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="userList"> [userList] </span>
+ </div>
+ </div>
+ </div>
</div>
- </wicket:panel>
+ </form>
+ </div>
+ </wicket:panel>
</html>
Modified: syncope/trunk/console/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/style.css?rev=1592942&r1=1592941&r2=1592942&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Wed May 7 07:36:35 2014
@@ -17,208 +17,208 @@
* under the License.
*/
body {
- margin: 0px;
- padding: 0px;
- font-family: Verdana, Tahoma, sans-serif;
- color: #333;
- font-size: 62.5%;
+ margin: 0px;
+ padding: 0px;
+ font-family: Verdana, Tahoma, sans-serif;
+ color: #333;
+ font-size: 62.5%;
}
/* id */
#tabs {
- margin: 0px 5px;
- margin-top: 5px;
+ margin: 0px 5px;
+ margin-top: 5px;
}
#roletabs {
- margin: 0px 5px;
- margin-top: 5px;
+ margin: 0px 5px;
+ margin-top: 5px;
}
#tabs div {
- /*background-color: #FFF;*/
+ /*background-color: #FFF;*/
}
#logo {
- margin-top: 10px;
- margin-bottom: 6px;
+ margin-top: 10px;
+ margin-bottom: 6px;
}
#splash {
- background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
- width: 400px;
- margin-left: auto;
- margin-right: auto;
- margin-top: 100px;
- border: 1px solid #463;
+ background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
+ width: 400px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 100px;
+ border: 1px solid #463;
}
#splash a {
- color: #463;
- text-decoration: none;
- font-size: 14px;
+ color: #463;
+ text-decoration: none;
+ font-size: 14px;
}
a img {
- border: none;
+ border: none;
}
#splash h2 {
- color: #FFF;
- margin: 0px;
- margin-top: 8px;
- margin-bottom: 20px;
- font-size: 14px;
- text-align: center;
- font-weight: normal;
+ color: #FFF;
+ margin: 0px;
+ margin-top: 8px;
+ margin-bottom: 20px;
+ font-size: 14px;
+ text-align: center;
+ font-weight: normal;
}
#splash form {
- margin: 6px auto;
- width: 300px;
- text-align: center;
+ margin: 6px auto;
+ width: 300px;
+ text-align: center;
}
#splash form label {
- margin-right: 5px;
- display: block;
+ margin-right: 5px;
+ display: block;
}
#splash form label.password {
}
#splash form input {
- margin-bottom: 15px;
+ margin-bottom: 15px;
}
#splash p {
- margin: 6px 16px;
- border-top: 1px solid #463;
- text-align: center;
- padding-top: 8px;
+ margin: 6px 16px;
+ border-top: 1px solid #463;
+ text-align: center;
+ padding-top: 8px;
}
#splash ul {
- height: 320px;
- margin-left: 37px;
- padding-left: 28px;
- margin-top: 25px;
+ height: 320px;
+ margin-left: 37px;
+ padding-left: 28px;
+ margin-top: 25px;
}
#splash ul li {
- float: left;
- width: 90px;
- text-align: center;
- list-style: none;
- margin: 0px;
+ float: left;
+ width: 90px;
+ text-align: center;
+ list-style: none;
+ margin: 0px;
}
input[disabled] {
- background-color: #ddd;
- background-image: none;
+ background-color: #ddd;
+ background-image: none;
}
select[disabled] {
- background-color: #ddd;
- background-image: none;
+ background-color: #ddd;
+ background-image: none;
}
#loginFeedbackDiv {
- width: 100%;
+ width: 100%;
}
#loginFeedbackDiv ul {
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
- height: 30px;
- margin-left: 0px;
- padding-left: 0px;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
+ height: 30px;
+ margin-left: 0px;
+ padding-left: 0px;
}
#loginFeedbackDiv ul li{
- border:0 none;
- padding-left: 20px;
- padding: 1%;
- padding-top: 2%;
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
+ border:0 none;
+ padding-left: 20px;
+ padding: 1%;
+ padding-top: 2%;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
}
#feedbackDiv {
- height: 20px;
- margin: 0px;
- padding: 0px;
+ height: 20px;
+ margin: 0px;
+ padding: 0px;
}
#feedbackDiv ul{
- height: 20px !important;
- margin: 0px;
- padding: 0px;
+ height: 20px !important;
+ margin: 0px;
+ padding: 0px;
}
#feedbackDiv li{
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
}
#feedbackDiv ul li{
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
- color: red;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
+ color: red;
}
.feedbackPanel {
- padding-left:20pt;
- margin-right:20pt;
+ padding-left:20pt;
+ margin-right:20pt;
}
#navigationPane {
- background: url(../img/sf_testa.png) top repeat-x #FFF;
+ background: url(../img/sf_testa.png) top repeat-x #FFF;
}
#navigationPane a img {
- border: none;
+ border: none;
}
#navigationPane {
- height: 103px;
+ height: 103px;
}
#navigationPane a {
- color: #FFF;
- text-decoration: none;
+ color: #FFF;
+ text-decoration: none;
}
#navigationPane a:hover {
- color: #CCC;
+ color: #CCC;
}
#navigationPane ul {
- clear: both;
- padding: 0px;
- margin: 0px;
- margin-left: 280px;
+ clear: both;
+ padding: 0px;
+ margin: 0px;
+ margin-left: 280px;
}
#navigationPane ul li {
- float: left;
- width: 90px;
- text-align: center;
- margin: 0px;
- color: #FFF;
- font-size: 13px;
- list-style: none;
- padding: 1px;
+ float: left;
+ width: 90px;
+ text-align: center;
+ margin: 0px;
+ color: #FFF;
+ font-size: 13px;
+ list-style: none;
+ padding: 1px;
}
#navigationPane span {
- font-size: 13px;
+ font-size: 13px;
}
/* MODAL-FORM */
@@ -239,298 +239,298 @@ div#executions table td, div#executions
/* classi */
#navigationPane .schema {
- color: #99C;
+ color: #99C;
}
#navigationPane a img:hover {
- opacity:0.5;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
- filter:alpha(opacity=50)
+ opacity:0.5;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
+ filter:alpha(opacity=50)
}
#splash a img:hover {
- opacity:0.5;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
- filter:alpha(opacity=50)
+ opacity:0.5;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
+ filter:alpha(opacity=50)
}
#navigationPane .users {
- color: #9C0;
+ color: #9C0;
}
#navigationPane .roles {
- color: #F90;
+ color: #F90;
}
#navigationPane .resources {
- color: #09F;
+ color: #09F;
}
#navigationPane .tasks {
- color: #FD0;
+ color: #FD0;
}
#navigationPane .todo {
- color: #F3C98E;
+ color: #F3C98E;
}
#navigationPane .connectors {
- color: #09F;
+ color: #09F;
}
#navigationPane .reports {
- color: #F66;
+ color: #F66;
}
#navigationPane .configuration {
- color: #CCC;
+ color: #CCC;
}
.onerowlabel {
- float: left;
+ float: left;
}
.onerowcheckbox {
- margin-left: 10em;
+ margin-left: 10em;
}
div#attributes-view label {
- display: block;
- clear: none;
- width: 300px;
- margin-left: 20px;
+ display: block;
+ clear: none;
+ width: 300px;
+ margin-left: 20px;
}
div#attributes-view input {
- display: block;
- float: left;
- clear: left;
- height: 12px;
- padding: 0;
- margin: 0;
+ display: block;
+ float: left;
+ clear: left;
+ height: 12px;
+ padding: 0;
+ margin: 0;
}
.selectedRow {
- background-color: #eef1f1; /* alternative: LemonChiffon */
+ background-color: #eef1f1; /* alternative: LemonChiffon */
}
/* WICKET DATATABLE HEADERS */
.headers {
- border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
- 50% 50% repeat-x;
+ border: 1px solid #aaaaaa;
+ background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
+ 50% 50% repeat-x;
}
em {
- font-size: inherit;
- color: gray;
+ font-size: inherit;
+ color: gray;
}
em img {
- opacity:0.4;
- filter:alpha(opacity=40);
+ opacity:0.4;
+ filter:alpha(opacity=40);
}
th.action{
- width: 140px;
+ width: 140px;
}
td.action{
- text-align: center;
+ text-align: center;
}
.navigatorLabel {
- float: left;
+ float: left;
}
.navigator {
- text-align: right;
+ text-align: right;
}
.role-tree {
- width: 30%;
- display: block;
- float: left;
+ width: 30%;
+ display: block;
+ float: left;
}
.roleTable {
- line-height: 1.5em;
+ line-height: 1.5em;
}
.tree-folder-other {
- padding-top: 2px;
- display: block;
- height: 18px;
+ padding-top: 2px;
+ display: block;
+ height: 18px;
}
.tree-folder-open {
- display: block;
- height: 18px;
+ display: block;
+ height: 18px;
}
#versionMP {
- text-align: justify;
- color: #463;
- background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
- border: 1px solid #463;
- padding: 5px;
+ text-align: justify;
+ color: #463;
+ background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
+ border: 1px solid #463;
+ padding: 5px;
}
#versionMP a {
- color: white;
- text-decoration: none;
+ color: white;
+ text-decoration: none;
}
#versionMP a:hover {
- color: #463;
- text-decoration: none;
+ color: #463;
+ text-decoration: none;
}
.tooltip{
- position: absolute;
- left: -72px;
- top: 23px;
- z-index: 1000000;
- line-height: normal;
- _padding-top: 0em;
- width: 19em;
- border: 1px solid black;
- background-color: whitesmoke;
- opacity: 0.9;
- color: black;
- padding: 3px;
- font-size: 11px;
+ position: absolute;
+ left: -72px;
+ top: 23px;
+ z-index: 1000000;
+ line-height: normal;
+ _padding-top: 0em;
+ width: 19em;
+ border: 1px solid black;
+ background-color: whitesmoke;
+ opacity: 0.9;
+ color: black;
+ padding: 3px;
+ font-size: 11px;
}
.help {
- position: relative;
- float: right;
- top: 3px;
- left: -15px;
+ position: relative;
+ float: right;
+ top: 3px;
+ left: -15px;
}
.help a {
- color: #463;
- text-decoration: none;
+ color: #463;
+ text-decoration: none;
}
.help a:hover {
- color: blue;
- text-decoration: none;
+ color: blue;
+ text-decoration: none;
}
.tree-junction-expanded {
- display: none;
+ display: none;
}
/* Style for autocomplete field */
div.wicket-aa {
- font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
- font-size: 12px;
- background-color: white;
- border-width: 1px;
- border-color: #cccccc;
- border-style: solid;
- padding: 2px;
- margin: 1px 0 0 0;
- text-align:left;
+ font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
+ font-size: 12px;
+ background-color: white;
+ border-width: 1px;
+ border-color: #cccccc;
+ border-style: solid;
+ padding: 2px;
+ margin: 1px 0 0 0;
+ text-align:left;
}
div.wicket-aa ul {
- list-style:none;
- padding: 2px;
- margin:0;
+ list-style:none;
+ padding: 2px;
+ margin:0;
}
div.wicket-aa ul li.selected {
- background-color: #FFFF00;
- padding: 2px;
- margin:0;
+ background-color: #FFFF00;
+ padding: 2px;
+ margin:0;
}
.notificationpanel {
- margin: 0px;
- padding: 0px;
- border-radius: 5px;
+ margin: 0px;
+ padding: 0px;
+ border-radius: 5px;
}
.notificationpanel_bottom_left {
- bottom: 100px;
- left: 30px;
+ bottom: 100px;
+ left: 30px;
}
.notificationpanel_bottom_detail_form {
- top: 540px;
- right: 30px;
+ top: 540px;
+ right: 30px;
}
.notificationpanel_bottom_right {
- bottom: 100px;
- right: 30px;
+ bottom: 100px;
+ right: 30px;
}
.notificationpanel_top_right {
- top: 15px;
- right: 30px;
+ top: 15px;
+ right: 30px;
}
/* notification panel info style */
.notificationpanel_border_200 {
- color: green;
- margin: 0px;
- background:url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") repeat-x scroll 50% 50% #CCCCCC;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- box-shadow: 0px 0px 5px gray;
+ color: green;
+ margin: 0px;
+ background:url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") repeat-x scroll 50% 50% #CCCCCC;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border: 1px solid gray;
+ box-shadow: 0px 0px 5px gray;
}
.notificationpanel_row_INFO {
- list-style-type: none;
- color: green;
+ list-style-type: none;
+ color: green;
}
.notificationpanel_row_INFO span {
- list-style-type: none;
- color: green;
- background: url("../img/ok.png") no-repeat left;
- border:0 none;
- padding-left: 20px;
+ list-style-type: none;
+ color: green;
+ background: url("../img/ok.png") no-repeat left;
+ border:0 none;
+ padding-left: 20px;
}
/* notification panel warning style */
.notificationpanel_border_300 {
- border: 1px solid orangered;
- box-shadow: 0px 0px 5px gray;
+ border: 1px solid orangered;
+ box-shadow: 0px 0px 5px gray;
}
.notificationpanel_row_WARNING {
- color: orangered;
- list-style-type: none;
- border:0 none;
- padding-left: 20px;
+ color: orangered;
+ list-style-type: none;
+ border:0 none;
+ padding-left: 20px;
}
/* notification panel error style */
.notificationpanel_border_400 {
- color: red;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- box-shadow: 0px 0px 5px gray;
- border-color: red;
- background-image: -moz-linear-gradient(top, #FF8585 0%, #E60008 100%);
- background-image: -webkit-linear-gradient(top, #FF8585 0%, #E60008 100%);
- background-image: -o-linear-gradient(top, #FF8585 0%, #E60008 100%);
- background-image: -ms-linear-gradient(top, #FF8585 0%, #E60008 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #FF8585), color-stop(1, #E60008));
- font-weight: bold;
+ color: red;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border: 1px solid gray;
+ box-shadow: 0px 0px 5px gray;
+ border-color: red;
+ background-image: -moz-linear-gradient(top, #FF8585 0%, #E60008 100%);
+ background-image: -webkit-linear-gradient(top, #FF8585 0%, #E60008 100%);
+ background-image: -o-linear-gradient(top, #FF8585 0%, #E60008 100%);
+ background-image: -ms-linear-gradient(top, #FF8585 0%, #E60008 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #FF8585), color-stop(1, #E60008));
+ font-weight: bold;
}
.notificationpanel_row_ERROR {
- list-style-type: none;
- color: black;
+ list-style-type: none;
+ color: black;
}
.notificationpanel_row_ERROR span {
- border:0 none;
+ border:0 none;
}