Author: mdisabatino
Date: Mon Jul 22 14:44:51 2013
New Revision: 1505698
URL: http://svn.apache.org/r1505698
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/FailureMessageModalPage.html
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1505624-1505688
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/FailureMessageModalPage.html
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/FailureMessageModalPage.html?rev=1505698&r1=1505697&r2=1505698&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/FailureMessageModalPage.html
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/FailureMessageModalPage.html
Mon Jul 22 14:44:51 2013
@@ -20,26 +20,17 @@ under the License.
<style>
.w_content_3 {
padding: 0;
- }
-
- .w_body_1{
color: #333333;
font-family: Verdana,Tahoma,sans-serif;
font-size: 62.5%;
}
</style>
-<html>
- <head>
- <title></title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- </head>
- <body class="w_body_1">
- <div class="w_content_3">
- <div>
- <div style="margin: 1em">
- <pre wicket:id="failureMessage"></pre>
- </div>
+<wicket:extend>
+ <div class="w_content_3">
+ <div>
+ <div style="margin: 1em">
+ <pre wicket:id="failureMessage"></pre>
</div>
</div>
- </body>
-</html>
+ </div>
+</wicket:extend>