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 2016/01/15 15:22:15 UTC
[1/2] syncope git commit: Fixing website links
Repository: syncope
Updated Branches:
refs/heads/master 997bc50d3 -> 6fa78799b
Fixing website links
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9cf1291a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9cf1291a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9cf1291a
Branch: refs/heads/master
Commit: 9cf1291abadd64c07a0ee7811c2524d39653d711
Parents: 997bc50
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 15 13:48:46 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 15 13:48:46 2016 +0100
----------------------------------------------------------------------
src/site/xdoc/docs/index.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cf1291a/src/site/xdoc/docs/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/docs/index.xml b/src/site/xdoc/docs/index.xml
index 592009a..79660fa 100644
--- a/src/site/xdoc/docs/index.xml
+++ b/src/site/xdoc/docs/index.xml
@@ -36,10 +36,10 @@ under the License.
</p>
<p>
If you find errors or omissions in the documentation, please don’t hesitate to
- <a href="issue-tracking.html">submit an issue</a> or
- <a href="contributing.html#Documentation">contribute</a>.
+ <a href="../issue-tracking.html">submit an issue</a> or
+ <a href="../contributing.html#Documentation">contribute</a>.
We also encourage you to ask questions and discuss any aspects of the project on the
- <a href="mailing-lists.html">mailing lists or IRC</a>. New contributors are always welcome!
+ <a href="../mailing-lists.html">mailing lists or IRC</a>. New contributors are always welcome!
</p>
<subsection name="Guides">
[2/2] syncope git commit: [SYNCOPE-746] Fixing left pane management
for extensions
Posted by il...@apache.org.
[SYNCOPE-746] Fixing left pane management for extensions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6fa78799
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6fa78799
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6fa78799
Branch: refs/heads/master
Commit: 6fa78799bd9f04641f2f2a6105813109a7ab796b
Parents: 9cf1291
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 15 15:22:06 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 15 15:22:06 2016 +0100
----------------------------------------------------------------------
.../syncope/client/console/pages/BasePage.java | 114 +++++++++++++------
.../syncope/client/console/pages/BasePage.html | 10 +-
2 files changed, 83 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6fa78799/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index c3228be..76ea15d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.pages;
+import java.util.List;
import org.apache.syncope.client.console.SyncopeConsoleApplication;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.annotations.ExtPage;
@@ -88,7 +89,7 @@ public class BasePage extends WebPage implements NotificationAwareComponent, IAj
add(new Label("version", SyncopeConsoleApplication.get().getVersion()));
add(new Label("username", SyncopeConsoleSession.get().getSelfTO().getUsername()));
- final WebMarkupContainer todosContainer = new WebMarkupContainer("todosContainer");
+ WebMarkupContainer todosContainer = new WebMarkupContainer("todosContainer");
add(todosContainer);
Label todos = new Label("todos", "0");
todosContainer.add(todos);
@@ -123,27 +124,25 @@ public class BasePage extends WebPage implements NotificationAwareComponent, IAj
add(confLIContainer);
WebMarkupContainer confULContainer = new WebMarkupContainer(getULContainerId("configuration"));
confLIContainer.add(confULContainer);
- MetaDataRoleAuthorizationStrategy.authorize(
- liContainer, WebPage.RENDER, StandardEntitlement.CONFIGURATION_LIST);
liContainer = new WebMarkupContainer(getLIContainerId("workflow"));
confULContainer.add(liContainer);
- final BookmarkablePageLink<Page> workflowLink = new BookmarkablePageLink<>("workflow", Workflow.class);
+ BookmarkablePageLink<Page> workflowLink = new BookmarkablePageLink<>("workflow", Workflow.class);
MetaDataRoleAuthorizationStrategy.authorize(
workflowLink, WebPage.ENABLE, StandardEntitlement.WORKFLOW_DEF_READ);
liContainer.add(workflowLink);
liContainer = new WebMarkupContainer(getLIContainerId("logs"));
confULContainer.add(liContainer);
- final BookmarkablePageLink<Page> logsLink = new BookmarkablePageLink<>("logs", Logs.class);
+ BookmarkablePageLink<Page> logsLink = new BookmarkablePageLink<>("logs", Logs.class);
MetaDataRoleAuthorizationStrategy.authorize(logsLink, WebPage.ENABLE, StandardEntitlement.LOG_LIST);
liContainer.add(logsLink);
MetaDataRoleAuthorizationStrategy.authorize(liContainer, WebPage.RENDER, StandardEntitlement.LOG_LIST);
liContainer = new WebMarkupContainer(getLIContainerId("securityquestions"));
confULContainer.add(liContainer);
- final BookmarkablePageLink<Page> secuityQuestionsLink = new BookmarkablePageLink<>("securityquestions",
- SecurityQuestions.class);
+ BookmarkablePageLink<Page> secuityQuestionsLink =
+ new BookmarkablePageLink<>("securityquestions", SecurityQuestions.class);
liContainer.add(secuityQuestionsLink);
liContainer = new WebMarkupContainer(getLIContainerId("types"));
@@ -171,38 +170,10 @@ public class BasePage extends WebPage implements NotificationAwareComponent, IAj
liContainer.add(new BookmarkablePageLink<>("notifications", Notifications.class));
MetaDataRoleAuthorizationStrategy.authorize(liContainer, WebPage.RENDER, StandardEntitlement.NOTIFICATION_LIST);
- ClassPathScanImplementationLookup classPathScanImplementationLookup =
- (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
- getServletContext().getAttribute(ConsoleInitializer.CLASSPATH_LOOKUP);
- ListView<Class<? extends AbstractExtPage>> extPages = new ListView<Class<? extends AbstractExtPage>>(
- "extPages", classPathScanImplementationLookup.getExtPageClasses()) {
-
- private static final long serialVersionUID = 4949588177564901031L;
-
- @Override
- protected void populateItem(final ListItem<Class<? extends AbstractExtPage>> item) {
- WebMarkupContainer liContainer = new WebMarkupContainer("extPageLI");
- item.add(liContainer);
-
- BookmarkablePageLink<?> link = new BookmarkablePageLink<>("extPage", item.getModelObject());
- liContainer.add(link);
-
- ExtPage ann = item.getModelObject().getAnnotation(ExtPage.class);
-
- link.add(new Label("extPageLabel", ann.label()));
-
- Label extPageIcon = new Label("extPageIcon");
- extPageIcon.add(new AttributeModifier("class", "fa " + ann.icon()));
- link.add(extPageIcon);
- }
- };
- extPages.setOutputMarkupId(true);
- add(extPages);
-
add(new Label("domain", SyncopeConsoleSession.get().getDomain()));
add(new BookmarkablePageLink<Page>("logout", Logout.class));
- // set 'active' menu item
+ // set 'active' menu item for everything but extensions
// 1. check if current class is set to top-level menu
Component containingLI = get(getLIContainerId(getClass().getSimpleName().toLowerCase()));
// 2. if not, check if it is under 'Configuration'
@@ -245,6 +216,77 @@ public class BasePage extends WebPage implements NotificationAwareComponent, IAj
});
}
}
+
+ // Extensions
+ ClassPathScanImplementationLookup classPathScanImplementationLookup =
+ (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
+ getServletContext().getAttribute(ConsoleInitializer.CLASSPATH_LOOKUP);
+ List<Class<? extends AbstractExtPage>> extPageClasses = classPathScanImplementationLookup.getExtPageClasses();
+
+ WebMarkupContainer extensionsLI = new WebMarkupContainer(getLIContainerId("extensions"));
+ extensionsLI.setOutputMarkupPlaceholderTag(true);
+ extensionsLI.setVisible(!extPageClasses.isEmpty());
+ add(extensionsLI);
+
+ ListView<Class<? extends AbstractExtPage>> extPages = new ListView<Class<? extends AbstractExtPage>>(
+ "extPages", extPageClasses) {
+
+ private static final long serialVersionUID = 4949588177564901031L;
+
+ @Override
+ protected void populateItem(final ListItem<Class<? extends AbstractExtPage>> item) {
+ WebMarkupContainer containingLI = new WebMarkupContainer("extPageLI");
+ item.add(containingLI);
+ if (item.getModelObject().equals(BasePage.this.getClass())) {
+ containingLI.add(new Behavior() {
+
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+ tag.put("class", "active");
+ }
+ });
+ }
+
+ BookmarkablePageLink<?> link = new BookmarkablePageLink<>("extPage", item.getModelObject());
+ containingLI.add(link);
+
+ ExtPage ann = item.getModelObject().getAnnotation(ExtPage.class);
+
+ link.add(new Label("extPageLabel", ann.label()));
+
+ Label extPageIcon = new Label("extPageIcon");
+ extPageIcon.add(new AttributeModifier("class", "fa " + ann.icon()));
+ link.add(extPageIcon);
+ }
+ };
+ extPages.setOutputMarkupId(true);
+ extensionsLI.add(extPages);
+
+ if (getPage() instanceof AbstractExtPage) {
+ extPages.add(new Behavior() {
+
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+ tag.put("class", "treeview-menu menu-open");
+ tag.put("style", "display: block;");
+ }
+
+ });
+
+ extensionsLI.add(new Behavior() {
+
+ private static final long serialVersionUID = 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag) {
+ tag.put("class", "treeview active");
+ }
+ });
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/6fa78799/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
index 84f9060..7a18415 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
@@ -92,10 +92,10 @@ under the License.
<aside class="main-sidebar block-sidebar">
<section class="sidebar">
<ul class="sidebar-menu">
- <li wicket:id="dashboardLI"><a href="#" wicket:id="dashboard"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li>
- <li wicket:id="realmsLI"><a href="#" wicket:id="realms"><i class="fa fa-folder-o"></i><span>Realms</span></a></li>
- <li wicket:id="topologyLI"><a href="#" wicket:id="topology"><i class="fa fa-plug"></i><span>Topology</span></a></li>
- <li wicket:id="reportsLI"><a href="#" wicket:id="reports"><i class="fa fa-pie-chart"></i><span>Reports</span></a></li>
+ <li wicket:id="dashboardLI"><a href="#" wicket:id="dashboard"><i class="fa fa-dashboard"></i>Dashboard</a></li>
+ <li wicket:id="realmsLI"><a href="#" wicket:id="realms"><i class="fa fa-folder-o"></i>Realms</a></li>
+ <li wicket:id="topologyLI"><a href="#" wicket:id="topology"><i class="fa fa-plug"></i>Topology</a></li>
+ <li wicket:id="reportsLI"><a href="#" wicket:id="reports"><i class="fa fa-pie-chart"></i>Reports</a></li>
<li wicket:id="configurationLI" class="treeview">
<a href="#"><i class="fa fa-edit"></i><span>Configuration</span> <i class="fa fa-angle-left pull-right"></i></a>
<ul wicket:id="configurationUL" class="treeview-menu">
@@ -109,7 +109,7 @@ under the License.
<li wicket:id="notificationsLI"><a href="#" wicket:id="notifications"><i class="fa fa-envelope-o"></i>Notifications</a></li>
</ul>
</li>
- <li class="treeview">
+ <li wicket:id="extensionsLI" class="treeview">
<a href="#"><i class="fa fa-puzzle-piece"></i><span>Extensions</span> <i class="fa fa-angle-left pull-right"></i></a>
<ul class="treeview-menu" wicket:id="extPages">
<li wicket:id="extPageLI">