syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1439917 - in /syncope/trunk/console/src/main: java/org/apache/syncope/console/pages/ resources/org/apache/syncope/console/pages/
Date Tue, 29 Jan 2013 14:52:21 GMT
Author: ilgrosso
Date: Tue Jan 29 14:52:21 2013
New Revision: 1439917

URL: http://svn.apache.org/viewvc?rev=1439917&view=rev
Log:
[SYNCOPE-293] Aligning InfoModalPage with other modal pages

Modified:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java?rev=1439917&r1=1439916&r2=1439917&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
Tue Jan 29 14:52:21 2013
@@ -1,27 +1,28 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.console.commons.CloseOnESCBehavior;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
-public class InfoModalPage extends WebPage {
+public class InfoModalPage extends BaseModalPage {
 
     private static final long serialVersionUID = 5558354927844399580L;
 
@@ -32,13 +33,11 @@ public class InfoModalPage extends WebPa
     private String licenseUrl;
 
     public InfoModalPage(final String version, final String coreVersion) {
-
+        super();
 
         add(new ExternalLink("syncopeLink", siteUrl));
         add(new ExternalLink("licenseLink", licenseUrl));
         add(new Label("consoleVersion", version));
         add(new Label("coreVersion", coreVersion));
-        
-        add(new CloseOnESCBehavior("keyup"));
     }
 }

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html?rev=1439917&r1=1439916&r2=1439917&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
Tue Jan 29 14:52:21 2013
@@ -1,46 +1,39 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
 -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta http-equiv="Content-Style-Type" content="text/css"/>
-
-    <title>Apache Syncope - <wicket:message key="info"/></title>
-
-    <link rel="stylesheet" href="css/style.css" type="text/css" media="all"/>
-  </head>
-  <body>
-    <div id="versionMP">
-      <h1><a wicket:id="syncopeLink" target="_blank"><img style="margin-top:
-5px;" src="img/logo.png" alt="syncope" title="syncope"/></a></h1>
-      <br/>
-      <fieldset>
-        <table style="font-size:15px;">
-          <tr>
-            <td>Console:</td>
-            <td><span wicket:id="consoleVersion"/></td>
-          </tr>
-          <tr>
-            <td>Core:</td>
-            <td><span wicket:id="coreVersion"/></td>
-          </tr>
-        </table>
-        <legend><wicket:message key="version"/></legend>
-      </fieldset>
-      <h4>Licensed under the <a wicket:id="licenseLink" target="_blank">Apache
License, Version 2.0 </a><wicket:message key="license"/></h4>
-    </div>
-  </body>
-</html>
+<wicket:extend>
+  <div id="versionMP">
+    <h1><a wicket:id="syncopeLink" target="_blank"><img style="margin-top:
-5px;" src="img/logo.png" alt="syncope" title="syncope"/></a></h1>
+    <br/><br/>
+    <fieldset>
+      <table style="font-size:15px;">
+        <tr>
+          <td>Console:</td>
+          <td><span wicket:id="consoleVersion"/></td>
+        </tr>
+        <tr>
+          <td>Core:</td>
+          <td><span wicket:id="coreVersion"/></td>
+        </tr>
+      </table>
+      <legend><wicket:message key="version"/></legend>
+    </fieldset>
+    <br/>
+    <wicket:message key="disclaimerHead"/> <a wicket:id="licenseLink" target="_blank">Apache
License, Version 2.0 </a><wicket:message key="disclaimerTail"/>
+  </div>
+</wicket:extend>

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties?rev=1439917&r1=1439916&r2=1439917&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
Tue Jan 29 14:52:21 2013
@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 info=Information
-license=(the "License"); you may not use this file except in compliance with the License.
You may obtain a copy of the License a http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the License is distributed
on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the
License.
+disclaimerTail=(the "License"); you may not use this file except in compliance with the License.
You may obtain a copy of the License a http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the License is distributed
on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the
License.
 syncopeSite=Apache Syncope Site
 apacheLicense=Apache 2.0 license
 version=Version
+disclaimerHead=Licensed under the

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties?rev=1439917&r1=1439916&r2=1439917&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties
Tue Jan 29 14:52:21 2013
@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 info=Informazioni
-license=(the "License"); you may not use this file except in compliance with the License.
You may obtain a copy of the License a http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the License is distributed
on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the
License.
+disclaimerTail=(the "License"); you may not use this file except in compliance with the License.
You may obtain a copy of the License a http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the License is distributed
on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the
License.
 syncopeSite=Sito di Apache Syncope
 apacheLicense=Licenza Apache 2.0
 version=Versione
+disclaimerHead=Licensed under the



Mime
View raw message