Author: andreapatricelli Date: Thu May 8 07:29:55 2014 New Revision: 1593194
URL: http://svn.apache.org/r1593194 Log: [SYNCOPE-489] restored functionality of notification panel in XML editor popup, improved its graphical layout 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/XMLEditorPopupPage.java syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePopupPage.html syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.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/XMLEditorPopupPage.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties 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=1593194&r1=1593193&r2=1593194&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 Thu May 8 07:29:55 2014 @@ -179,7 +179,7 @@ public class Configuration extends BaseP BookmarkablePageLink<Void> xmlEditor = new BookmarkablePageLink<Void>("xmlEditor", XMLEditorPopupPage.class); - xmlEditor.setPopupSettings(new VeilPopupSettings().setHeight(350).setWidth(800)); + xmlEditor.setPopupSettings(new VeilPopupSettings().setHeight(480).setWidth(800)); MetaDataRoleAuthorizationStrategy.authorize(xmlEditor, ENABLE, xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefRead")); workflowDefContainer.add(xmlEditor); 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=1593194&r1=1593193&r2=1593194&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 Thu May 8 07:29:55 2014 @@ -28,6 +28,7 @@ import org.apache.syncope.console.wicket import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; +import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.Model; @@ -77,10 +78,12 @@ public class XMLEditorPopupPage extends } }; + final Button close = new Button("closePage", new Model<String>(getString(CANCEL))); + MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefUpdate")); wfForm.add(submit); - + wfForm.add(close); this.add(wfForm); } Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePopupPage.html URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePopupPage.html?rev=1593194&r1=1593193&r2=1593194&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePopupPage.html (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePopupPage.html Thu May 8 07:29:55 2014 @@ -20,6 +20,7 @@ under the License. <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/jquery-ui.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"/> @@ -30,6 +31,17 @@ under the License. repeat-x scroll 50% 50% #E6E6E6 !important; } </style> + + <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 onload="setTimeout('window.focus();', 0);"> <div wicket:id="feedback"/> Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1593194&r1=1593193&r2=1593194&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Thu May 8 07:29:55 2014 @@ -110,7 +110,7 @@ under the License. <span wicket:id="noActivitiEnabledForUsers"><i><wicket:message key="noActivitiEnabledForUsers"/></i></span> <span wicket:id="workflowDefContainer"> <div style="float: left;"> - <button wicket:id="activitiModeler"> + <button wicket:id="activitiModeler" style="width: 122px"> <div style="display: table-row;"> <div style="display: table-cell"> <img src="img/modeler.png" alt="Activiti Modeler" title="Activiti Modeler"/> @@ -122,7 +122,7 @@ under the License. </button> </div> <div> - <button wicket:id="xmlEditor"> + <button wicket:id="xmlEditor" style="width: 122px"> <div style="display: table-row;"> <div style="display: table-cell"> <img src="img/xml.png" alt="XML editor" title="XML editor"/> 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=1593194&r1=1593193&r2=1593194&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 Thu May 8 07:29:55 2014 @@ -36,23 +36,47 @@ under the License. window.opener.location.reload(); } </script> + <style> + .w_content_3 { + padding: 0; + color: #333333; + font-family: Verdana,Tahoma,sans-serif; + font-size: 100%; + border: 1px solid #BBBBBB; + padding: 1%; + } + </style> </wicket:head> <wicket:extend> - <form wicket:id="workflowDefForm"> - <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width: 100%; height: 350px;"> - </textarea> - <div style="margin: 10px;"> - <input type="submit" - class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" - wicket:id="apply" - onclick="window.close();"/> + <div style="padding: 1%;"> + <div class="w_content_3"> + <p class="ui-widget ui-corner-all ui-widget-header"> + <wicket:message key="title"/> + </p> + <form wicket:id="workflowDefForm"> + <div class="ui-tabs ui-widget ui-widget-content ui-corner-all"> + <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width: 100%; height: 350px;"> + </textarea> + </div> + <div style="padding-top: 1%;"> + <input type="submit" + class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" + wicket:id="apply" + style="width: 50px"/> + <input type="submit" + wicket:id="closePage" + class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" + onclick="window.close();" + style="width: 50px"/> + </div> + </form> </div> - </form> + </div> <script> 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/XMLEditorPopupPage.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties?rev=1593194&r1=1593193&r2=1593194&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties Thu May 8 07:29:55 2014 @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. submit=Save +cancel=Close +title=Workflow XML Editor Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties?rev=1593194&r1=1593193&r2=1593194&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties Thu May 8 07:29:55 2014 @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. submit=Salva +cancel=Chiudi +title=Workflow XML Editor Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties?rev=1593194&r1=1593193&r2=1593194&view=diff ============================================================================== --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties Thu May 8 07:29:55 2014 @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. submit=Salvar +cancel=Fechar +title=Workflow XML Editor \ No newline at end of file
