You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/01/31 17:41:18 UTC
svn commit: r1441051 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/markup/html/list/
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
Author: ilgrosso
Date: Thu Jan 31 16:41:17 2013
New Revision: 1441051
URL: http://svn.apache.org/viewvc?rev=1441051&view=rev
Log:
Adjusting some visual glitches in Audit
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/
syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java (with props)
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports$AuditCategoryPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
Added: syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java?rev=1441051&view=auto
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java (added)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java Thu Jan 31 16:41:17 2013
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.console.markup.html.list;
+
+import java.util.List;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.IModel;
+
+public abstract class AltListView<T> extends ListView<T> {
+
+ private static final long serialVersionUID = 251378224847354710L;
+
+ public AltListView(final String id) {
+ super(id);
+ }
+
+ public AltListView(final String id, final IModel<? extends List<? extends T>> model) {
+ super(id, model);
+ }
+
+ public AltListView(final String id, final List<? extends T> list) {
+ super(id, list);
+ }
+
+ @Override
+ protected ListItem<T> newItem(final int index, final IModel<T> itemModel) {
+ return new ListItem<T>(index, itemModel) {
+
+ private static final long serialVersionUID = 5473483270932376694L;
+
+ @Override
+ protected void onComponentTag(final ComponentTag tag) {
+ if (index % 2 == 0) {
+ tag.append("class", "alt", " ");
+ }
+
+ super.onComponentTag(tag);
+ }
+ };
+ }
+}
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/list/AltListView.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1441051&r1=1441050&r2=1441051&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Thu Jan 31 16:41:17 2013
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.syncope.common.to.ReportTO;
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
@@ -33,6 +32,7 @@ import org.apache.syncope.common.validat
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.pages.panels.JQueryTabbedPanel;
import org.apache.syncope.console.rest.LoggerRestClient;
import org.apache.syncope.console.rest.ReportRestClient;
@@ -138,7 +138,7 @@ public class Reports extends BasePage {
columns.add(new DatePropertyColumn(new ResourceModel("startDate"), "startDate", "startDate"));
columns.add(new DatePropertyColumn(new ResourceModel("endDate"), "endDate", "endDate"));
columns.add(new PropertyColumn(new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
- columns.add(new AbstractColumn<ReportTO,String>(new ResourceModel("actions", "")) {
+ columns.add(new AbstractColumn<ReportTO, String>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -220,8 +220,9 @@ public class Reports extends BasePage {
reportContainer.add(reportTable);
reportContainer.setOutputMarkupId(true);
-
+
final AjaxLink reload = new IndicatingAjaxLink("reload") {
+
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -233,7 +234,7 @@ public class Reports extends BasePage {
};
reload.add(new Behavior() {
-
+
private static final long serialVersionUID = 1469628524240283489L;
@Override
@@ -347,7 +348,7 @@ public class Reports extends BasePage {
@Override
public Iterator<ReportTO> iterator(final long first, final long count) {
- List<ReportTO> list = reportRestClient.list(((int)first / paginatorRows) + 1, paginatorRows);
+ List<ReportTO> list = reportRestClient.list(((int) first / paginatorRows) + 1, paginatorRows);
Collections.sort(list, comparator);
@@ -478,7 +479,7 @@ public class Reports extends BasePage {
xmlRolesReader.getAllAllowedRoles("Audit", "disable"));
ListView<Enum<?>> categoryView =
- new ListView<Enum<?>>("categoryView", new ArrayList(category.getSubCategoryElements())) {
+ new AltListView<Enum<?>>("categoryView", new ArrayList(category.getSubCategoryElements())) {
private static final long serialVersionUID = 4949588177564901031L;
@@ -492,7 +493,7 @@ public class Reports extends BasePage {
add(categoryView);
ListView<Enum<?>> successView =
- new ListView<Enum<?>>("successView", new ArrayList(category.getSubCategoryElements())) {
+ new AltListView<Enum<?>>("successView", new ArrayList(category.getSubCategoryElements())) {
private static final long serialVersionUID = 4949588177564901031L;
@@ -509,7 +510,7 @@ public class Reports extends BasePage {
successGroup.add(successView);
ListView<Enum<?>> failureView =
- new ListView<Enum<?>>("failureView", new ArrayList(category.getSubCategoryElements())) {
+ new AltListView<Enum<?>>("failureView", new ArrayList(category.getSubCategoryElements())) {
private static final long serialVersionUID = 4949588177564901031L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java?rev=1441051&r1=1441050&r2=1441051&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java Thu Jan 31 16:41:17 2013
@@ -19,15 +19,14 @@
package org.apache.syncope.console.pages.panels;
import java.util.List;
-
import org.apache.wicket.extensions.ajax.markup.html.tabs.AjaxTabbedPanel;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
-public class JQueryTabbedPanel extends AjaxTabbedPanel {
+public class JQueryTabbedPanel<T extends ITab> extends AjaxTabbedPanel<T> {
private static final long serialVersionUID = -5059184710433341333L;
- public JQueryTabbedPanel(final String id, final List<ITab> tabs) {
+ public JQueryTabbedPanel(final String id, final List<T> tabs) {
super(id, tabs);
}
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1441051&r1=1441050&r2=1441051&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Thu Jan 31 16:41:17 2013
@@ -49,21 +49,14 @@ under the License.
});
/** Add rollover effect to tables supporting Ajax events (live)*/
- $('table.ui-widget.ui-widget-content.table-hover tbody tr')
- .live('mouseover mouseout', function(event) {
+ $('table.ui-widget.ui-widget-content.table-hover tbody tr').live('mouseover mouseout',
+ function(event) {
if (event.type == 'mouseover') {
$(this).addClass('selectedRow');
} else if (event.type == 'mouseout') {
$(this).removeClass('selectedRow');
}
});
-
- $(document).ready(function() {
- $("#editProfile").hide();
- $("#username").click(function() {
- $("#editProfile").toggle();
- });
- });
</script>
</head>
<body>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports$AuditCategoryPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports%24AuditCategoryPanel.html?rev=1441051&r1=1441050&r2=1441051&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports$AuditCategoryPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports$AuditCategoryPanel.html Thu Jan 31 16:41:17 2013
@@ -22,7 +22,7 @@ under the License.
.divtableheaderlabel {
font-weight: bold;
float:left;
- margin-left: 5px;
+ margin-left: 0px;
}
.divtableheadercell {
@@ -59,7 +59,7 @@ under the License.
<input type="checkbox" wicket:id="successSelector" style="margin-top: 0px;margin-bottom: 0px;"/>
</div>
<div class="divtableheadercell">
- <div class="divtableheaderlabel">Failure</div>
+ <div class="divtableheaderlabel"> Failure</div>
<input type="checkbox" wicket:id="failureSelector" style="margin-top: 0px;margin-bottom: 0px;"/>
</div>
</div>
@@ -67,17 +67,9 @@ under the License.
<div style="display:inline-table;">
<div style="display:table-cell;vertical-align:top;">
- <div id="divtablerow-label" wicket:id="categoryView">
- <div class="tablecolumn_label medium_fixedsize" style="height:20px;">
- <span wicket:id="subcategory">[subcategory]</span>
- </div>
+ <div wicket:id="categoryView" class="tablecolumn_label medium_fixedsize" style="height:20px;float:none;">
+ <span wicket:id="subcategory">[subcategory]</span>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('#divtablerow-label div:even').addClass("alt");
- });
- </script>
</div>
<div id="divtablerow-success" class="divtablecheckcolumn">
@@ -86,12 +78,6 @@ under the License.
<input type="checkbox" wicket:id="successCheck"/>
</div>
</span>
-
- <script type="text/javascript">
- $(function() {
- $('#divtablerow-success div:even').addClass("alt");
- });
- </script>
</div>
<div id="divtablerow-failure" class="divtablecheckcolumn">
@@ -100,12 +86,6 @@ under the License.
<input type="checkbox" wicket:id="failureCheck"/>
</div>
</span>
-
- <script type="text/javascript">
- $(function() {
- $('#divtablerow-failure div:even').addClass("alt");
- });
- </script>
</div>
</div>
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html?rev=1441051&r1=1441050&r2=1441051&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html Thu Jan 31 16:41:17 2013
@@ -17,23 +17,23 @@ specific language governing permissions
under the License.
-->
<wicket:head>
- <style>
- .settingsPos{
- position:relative;
- top:34px;
- left:93.2%;
- width:10px;
- text-decoration: none;
- }
-
- .settingsPosMultiPage{
- position:relative;
- top:64px;
- left:93.2%;
- width:10px;
- text-decoration: none;
- }
- </style>
+ <style>
+ .settingsPos{
+ position:relative;
+ top:34px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+
+ .settingsPosMultiPage{
+ position:relative;
+ top:64px;
+ left:93.2%;
+ width:10px;
+ text-decoration: none;
+ }
+ </style>
</wicket:head>
<wicket:extend>