syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject [1/4] syncope git commit: [SYNCOPE-745] report management + refactoring ModalPanel interface; still missing reportlets
Date Thu, 28 Apr 2016 16:40:38 GMT
Repository: syncope
Updated Branches:
  refs/heads/master e87e4102d -> ae52b12e1


http://git-wip-us.apache.org/repos/asf/syncope/blob/ae52b12e/client/console/src/main/resources/org/apache/syncope/client/console/tasks/TaskExecutionDetails_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/TaskExecutionDetails_ru.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/TaskExecutionDetails_ru.properties
deleted file mode 100644
index bf48601..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/TaskExecutionDetails_ru.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-#
-# 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.
-#
-# start=Начало
-start=\u041d\u0430\u0447\u0430\u043b\u043e
-# end=Окончание
-end=\u041e\u043a\u043e\u043d\u0447\u0430\u043d\u0438\u0435
-# status=Статус
-status=\u0421\u0442\u0430\u0442\u0443\u0441
-# execution.view=Итоговый статус запуска задачи '${key}'
-execution.view=\u0418\u0442\u043e\u0433\u043e\u0432\u044b\u0439 \u0441\u0442\u0430\u0442\u0443\u0441
\u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0437\u0430\u0434\u0430\u0447\u0438 '${key}'

http://git-wip-us.apache.org/repos/asf/syncope/blob/ae52b12e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html
b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html
index 602aec8..f2b070e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html
@@ -36,7 +36,7 @@ under the License.
         <ul class="menu">
           <li><i class="fa fa-minus"></i><a href="#" wicket:id="delete"><wicket:message
key="resource.menu.remove"/></a></li>
           <li><i class="fa fa-pencil"></i><a href="#" wicket:id="edit"><wicket:message
key="resource.menu.edit"/></a></li>
-          <li><i class="fa fa-pencil"></i><a href="#" wicket:id="provision"><wicket:message
key="resource.menu.provision"/></a></li>
+          <li><i class="fa fa-exchange"></i><a href="#" wicket:id="provision"><wicket:message
key="resource.menu.provision"/></a></li>
           <li><i class="fa fa-search"></i><a href="#" wicket:id="explore"><wicket:message
key="resource.menu.explore"/></a></li>
           <li><i class="fa fa-arrow-right"></i><a href="#" wicket:id="propagation"><wicket:message
key="task.propagation.list"/></a></li>
           <li><i class="fa fa-chevron-circle-left"></i><a href="#" wicket:id="pull"><wicket:message
key="task.pull.list"/></a></li>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ae52b12e/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
index b025ccd..62731fd 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
@@ -44,6 +44,7 @@ under the License.
     <span wicket:id="panelReset">[plus]</span>
     <span wicket:id="panelEdit">[plus]</span>
     <span wicket:id="panelTypeExtensions">[plus]</span>
+    <span wicket:id="panelFoEdit">[plus]</span>
     <span wicket:id="panelHtmlEdit">[plus]</span>
     <span wicket:id="panelTextEdit">[plus]</span>
     <span wicket:id="panelLayoutEdit">[plus]</span>
@@ -126,6 +127,10 @@ under the License.
       <a href="#" wicket:id="typeExtensionsLink" class="btn"><i id="actionLink"
class="fa fa-expand" alt="typeExtensions icon" title="Type extensions"></i></a>
     </wicket:fragment>
 
+    <wicket:fragment wicket:id="fragmentFoEdit">
+      <a href="#" wicket:id="foEditLink" class="btn"><i id="actionLink" class="fa
fa-file-pdf-o" alt="fo edit icon" title="FO Edit"></i></a>
+    </wicket:fragment>
+
     <wicket:fragment wicket:id="fragmentHtmlEdit">
       <a href="#" wicket:id="htmlEditLink" class="btn"><i id="actionLink" class="fa
fa-file-code-o" alt="html edit icon" title="HTML Edit"></i></a>
     </wicket:fragment>
@@ -145,7 +150,7 @@ under the License.
     <wicket:fragment wicket:id="fragmentPropagationTasks">
       <a href="#" wicket:id="propagationTasksLink" class="btn"><i class="fa fa-arrow-right"
alt="PropagationTasks icon" title="PropagationTasks"></i></a>
     </wicket:fragment>
-    
+
     <wicket:fragment wicket:id="fragmentNotificationTasks">
       <a href="#" wicket:id="notificationTasksLink" class="btn"><i class="fa fa-envelope-o"
alt="NotificationTasks icon" title="NotificationTasks"></i></a>
     </wicket:fragment>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ae52b12e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
index 719fd0b..e1d0b81 100644
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
@@ -81,7 +81,7 @@ public class CamelRoutesDirectoryPanel extends DirectoryPanel<
             private static final long serialVersionUID = -6388405037134399367L;
 
             @Override
-            public ModalPanel<CamelRouteTO> build(final String id, final int index,
final AjaxWizard.Mode mode) {
+            public WizardModalPanel<CamelRouteTO> build(final String id, final int
index, final AjaxWizard.Mode mode) {
                 final CamelRouteTO modelObject = newModelObject();
                 return new CamelRoutesModalPanel(modal, modelObject, pageRef) {
 


Mime
View raw message