You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2013/02/01 12:07:01 UTC
svn commit: r1441384 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/commons/
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/ resources/org/apache/syncope/...
Author: massi
Date: Fri Feb 1 11:06:59 2013
New Revision: 1441384
URL: http://svn.apache.org/viewvc?rev=1441384&view=rev
Log:
JEXL help added to role template details and user template details; fixed some layout bug
Removed:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel_it.properties
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/JexlHelpUtil.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
syncope/trunk/console/src/main/webapp/css/style.css
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/JexlHelpUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/JexlHelpUtil.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/JexlHelpUtil.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/JexlHelpUtil.java Fri Feb 1 11:06:59 2013
@@ -27,8 +27,8 @@ public class JexlHelpUtil {
private static final String JEXL_SYNTAX_URL = "http://commons.apache.org/jexl/reference/syntax.html";
- public static WebMarkupContainer getJexlHelpWebContainer() {
- final WebMarkupContainer jexlHelp = new WebMarkupContainer("jexlHelp");
+ public static WebMarkupContainer getJexlHelpWebContainer(final String wicketId) {
+ final WebMarkupContainer jexlHelp = new WebMarkupContainer(wicketId);
jexlHelp.setVisible(false);
jexlHelp.setOutputMarkupPlaceholderTag(true);
jexlHelp.setOutputMarkupId(true);
@@ -36,8 +36,8 @@ public class JexlHelpUtil {
return jexlHelp;
}
- public static AjaxLink getAjaxLink(final WebMarkupContainer wmc) {
- AjaxLink questionMarkJexlHelp = new AjaxLink("questionMarkJexlHelp") {
+ public static AjaxLink getAjaxLink(final WebMarkupContainer wmc, final String wicketId) {
+ AjaxLink questionMarkJexlHelp = new AjaxLink(wicketId) {
boolean toogle = false;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Fri Feb 1 11:06:59 2013
@@ -67,11 +67,11 @@ public class DerivedSchemaModalPage exte
new PropertyModel<String>(schema, "expression"));
expression.addRequiredLabel();
- final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer();
+ final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
schemaForm.add(jexlHelp);
- final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp);
+ final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
schemaForm.add(questionMarkJexlHelp);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java Fri Feb 1 11:06:59 2013
@@ -109,10 +109,10 @@ public class AttributesPanel extends Pan
final StringBuilder text = new StringBuilder(attributeTO.getSchema());
- final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer();
+ final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
item.add(jexlHelp);
- final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp);
+ final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
item.add(questionMarkJexlHelp);
if (!templateMode) {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Fri Feb 1 11:06:59 2013
@@ -221,10 +221,10 @@ public class ResourceMappingPanel extend
mappingContainer = new WebMarkupContainer("mappingContainer");
mappingContainer.setOutputMarkupId(true);
- final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer();
+ final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
mappingContainer.add(jexlHelp);
- AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp);
+ AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
mappingContainer.add(questionMarkJexlHelp);
add(mappingContainer);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java Fri Feb 1 11:06:59 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.console.commons.JexlHelpUtil;
import org.apache.syncope.console.pages.RoleSelectModalPage;
import org.apache.syncope.console.pages.UserOwnerSelectModalPage;
import org.apache.syncope.console.rest.RoleRestClient;
@@ -29,6 +30,7 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -127,8 +129,16 @@ public class RoleDetailsPanel extends Pa
final AjaxTextFieldPanel name =
new AjaxTextFieldPanel("name", "name", new PropertyModel<String>(roleTO, "name"));
+
+ final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
+ this.add(jexlHelp);
+
+ final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
+ this.add(questionMarkJexlHelp);
+
if (!templateMode) {
name.addRequiredLabel();
+ questionMarkJexlHelp.setVisible(false);
}
this.add(name);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserDetailsPanel.java Fri Feb 1 11:06:59 2013
@@ -19,10 +19,12 @@
package org.apache.syncope.console.pages.panels;
import org.apache.syncope.common.to.UserTO;
+import org.apache.syncope.console.commons.JexlHelpUtil;
import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -49,8 +51,16 @@ public class UserDetailsPanel extends Pa
// ------------------------
final FieldPanel<String> username = new AjaxTextFieldPanel("username", "username",
new PropertyModel<String>(userTO, "username"));
+
+ final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("usernameJexlHelp");
+ add(jexlHelp);
+
+ final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "usernameQuestionMarkJexlHelp");
+ add(questionMarkJexlHelp);
+
if (!templateMode) {
username.addRequiredLabel();
+ questionMarkJexlHelp.setVisible(false);
}
add(username);
// ------------------------
@@ -61,6 +71,13 @@ public class UserDetailsPanel extends Pa
FieldPanel<String> password;
Label confirmPasswordLabel = new Label("confirmPasswordLabel", new ResourceModel("confirmPassword"));
FieldPanel<String> confirmPassword;
+
+ final WebMarkupContainer pwdJexlHelp = JexlHelpUtil.getJexlHelpWebContainer("pwdJexlHelp");
+ add(pwdJexlHelp);
+
+ final AjaxLink pwdQuestionMarkJexlHelp = JexlHelpUtil.getAjaxLink(pwdJexlHelp, "pwdQuestionMarkJexlHelp");
+ add(pwdQuestionMarkJexlHelp);
+
if (templateMode) {
password = new AjaxTextFieldPanel("password", "password", new PropertyModel<String>(userTO, "password"));
@@ -69,6 +86,8 @@ public class UserDetailsPanel extends Pa
confirmPassword.setEnabled(false);
confirmPassword.setVisible(false);
} else {
+ pwdQuestionMarkJexlHelp.setVisible(false);
+
password = new AjaxPasswordFieldPanel("password", "password",
new PropertyModel<String>(userTO, "password"));
password.setRequired(userTO.getId() == 0);
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties Fri Feb 1 11:06:59 2013
@@ -40,3 +40,8 @@ error=Error
generic_error=An error occurred during the operation
id=Id
name=Name
+
+jexl_info=This field expects a JEXL expression, for example:
+jexl_ex1=surname + ',' + firstname
+jexl_ex2='new.' + surname
+jexl_syntax_url=Full JEXL reference
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties Fri Feb 1 11:06:59 2013
@@ -40,3 +40,8 @@ error=Errore
generic_error=Si \u00e8 verificato un errore durante l'operazione
id=Id
name=Nome
+
+jexl_info=In questo campo possono essere inserite espressioni di tipo JEXL, per esempio:
+jexl_ex1=surname + ',' + firstname
+jexl_ex2='new.' + surname
+jexl_syntax_url=Sintassi JEXL completa
\ No newline at end of file
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.html Fri Feb 1 11:06:59 2013
@@ -35,8 +35,8 @@ under the License.
</div>
<div class="tablecolumn_field medium_dynamicsize">
<span wicket:id="expression">[expression]</span>
+ <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
<div class="help">
- <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
<div wicket:id="jexlHelp" class="tooltip">
<wicket:message key="jexl_info"/>
<ul>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.properties?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage.properties Fri Feb 1 11:06:59 2013
@@ -20,8 +20,4 @@ expression=Expression
existing_schemas=Existing Schemas:
edit_attribute=Edit attribute
attributes=Derived attributes
-title=Derived Schema
-jexl_info=Field to JEXL expression, for example:
-jexl_ex1=surname + ',' + firstname
-jexl_ex2='new.' + surname
-jexl_syntax_url=Full JEXL reference
\ No newline at end of file
+title=Derived Schema
\ No newline at end of file
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_it.properties?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_it.properties Fri Feb 1 11:06:59 2013
@@ -20,8 +20,4 @@ expression=Expression
existing_schemas=Schemi presenti:
edit_attribute=Modifica attributo
attributes=Attributi derivati
-title=Schema Derivato
-jexl_info=In questo campo possono essere inserite espressioni di tipo Jexl, per esempio:
-jexl_ex1=surname + ',' + firstname
-jexl_ex2='new.' + surname
-jexl_syntax_url=Sintassi JEXL completa
\ No newline at end of file
+title=Schema Derivato
\ No newline at end of file
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AttributesPanel.html Fri Feb 1 11:06:59 2013
@@ -21,8 +21,13 @@ under the License.
<div class="tablerow" wicket:id="schemas">
<div class="tablecolumn_label short_dynamicsize">
<span wicket:id="name"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="panel">
+ [panel for dynamic input type markup]
+ </span>
+ <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
<div class="help">
- <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
<div wicket:id="jexlHelp" class="tooltip">
<wicket:message key="jexl_info"/>
<ul>
@@ -33,11 +38,6 @@ under the License.
</div>
</div>
</div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="panel">
- [panel for dynamic input type markup]
- </span>
- </div>
</div>
</wicket:panel>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html Fri Feb 1 11:06:59 2013
@@ -33,7 +33,7 @@ under the License.
<th><wicket:message key="mandatoryCondition"/>
<a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help">?</a>
<div wicket:id="jexlHelp" class="help tooltip"
- style="position: fixed; left: 580px; top: 115px; text-align: center; opacity: 0.9;">
+ style="position: fixed; left: 640px; top: 115px; text-align: left; opacity: 0.9; font-size: 10px;">
<wicket:message key="jexl_info"/>
<ul>
<li><wicket:message key="jexl_ex1"/></li>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel.html Fri Feb 1 11:06:59 2013
@@ -26,6 +26,17 @@ under the License.
</div>
<div class="tablecolumn_field medium_dynamicsize">
<span wicket:id="name" />
+ <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
+ <div class="help">
+ <div wicket:id="jexlHelp" class="tooltip">
+ <wicket:message key="jexl_info"/>
+ <ul>
+ <li><wicket:message key="jexl_ex1"/></li>
+ <li><wicket:message key="jexl_ex2"/></li>
+ </ul>
+ <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
+ </div>
+ </div>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html?rev=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel.html Fri Feb 1 11:06:59 2013
@@ -17,34 +17,56 @@ specific language governing permissions
under the License.
-->
<html>
- <wicket:panel>
- <div id="formtable">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="username"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="username" />
- </div>
+ <wicket:panel>
+ <div id="formtable">
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="username"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="username" />
+ <a wicket:id="usernameQuestionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
+ <div class="help">
+ <div wicket:id="usernameJexlHelp" class="tooltip">
+ <wicket:message key="jexl_info"/>
+ <ul>
+ <li><wicket:message key="jexl_ex1"/></li>
+ <li><wicket:message key="jexl_ex2"/></li>
+ </ul>
+ <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
</div>
+ </div>
+ </div>
+ </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <wicket:message key="password"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="password" />
- <span wicket:id="mandatory_pwd"></span>
- </div>
- </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <span wicket:id="confirmPasswordLabel"/>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="confirmPassword" />
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <wicket:message key="password"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="password" />
+ <span wicket:id="mandatory_pwd"></span>
+ <a wicket:id="pwdQuestionMarkJexlHelp" href="#" alt="Click to help" title="Click to help"><img src="img/help.png"/></a>
+ <div class="help">
+ <div wicket:id="pwdJexlHelp" class="tooltip">
+ <wicket:message key="jexl_info"/>
+ <ul>
+ <li><wicket:message key="jexl_ex1"/></li>
+ <li><wicket:message key="jexl_ex2"/></li>
+ </ul>
+ <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
</div>
+ </div>
+ </div>
+ </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="confirmPasswordLabel"/>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="confirmPassword" />
</div>
- </wicket:panel>
+ </div>
+ </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=1441384&r1=1441383&r2=1441384&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Fri Feb 1 11:06:59 2013
@@ -430,6 +430,7 @@ td.action{
opacity: 0.9;
color: black;
padding: 3px;
+ font-size: 11px;
}
.help {