You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/07 04:46:28 UTC
[04/29] isis git commit: ISIS-537 Show/Hide the copy link only when
hovering the entity's icon and title
ISIS-537 Show/Hide the copy link only when hovering the entity's icon and title
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2fc840fd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2fc840fd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2fc840fd
Branch: refs/heads/ISIS-939
Commit: 2fc840fd1822e5d82a73b41473140e3d6bcfdd66
Parents: cf910f3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 23:18:52 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 23:18:52 2014 +0200
----------------------------------------------------------------------
.../ui/components/entity/header/EntityHeaderPanel.html | 2 +-
.../ui/components/widgets/zclip/ZeroClipboardPanel.css | 6 +++++-
.../ui/components/widgets/zclip/ZeroClipboardPanel.html | 2 +-
.../ui/components/widgets/zclip/ZeroClipboardPanel.java | 11 +++++++++--
.../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 12 ++++++++++++
5 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
index 4a20cd7..76d70e6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<div class="entityHeaderPanel">
<h4 class="iconAndTitle">
- <div wicket:id="entityIconTitleAndCopylink" class="iconAndTitleLabel">[icon and title]</div>
+ <div wicket:id="entityIconTitleAndCopylink" class="iconAndTitleLabel entityIconTitleAndCopylink">[icon and title]</div>
<div class="entityActions" wicket:id="entityActions"></div>
<div class="clearfix"></div>
</h4>
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
index b62e3ba..a4793b9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
@@ -23,4 +23,8 @@
.zeroClipboardPanel a:hover {
text-decoration: none;
-}
\ No newline at end of file
+}
+
+.copyLink {
+ opacity: 0;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
index 52d1dfd..7f93a49 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<a wicket:id="copyLink" href="#" class="copyLink">
- <i class="fa fa-fw fa-link fa-lg"></i>
+ <i class="fa fa-fw fa-link" style="font-size: 1.5em"></i>
</a>
<wicket:remove>
TODO mgrigorov reenable the subscribing link after figuring out what it is.
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index 9dbb70c..1f116df 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -22,6 +22,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -37,6 +38,7 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Links;
public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
@@ -72,6 +74,13 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
setVisible(renderingHint == EntityModel.RenderingHint.REGULAR && mode == EntityModel.Mode.VIEW);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ PanelUtil.renderHead(response, ZeroClipboardPanel.class);
+ }
+
private AjaxLink<ObjectAdapter> createLink(String linkId) {
return newSimpleClipboardLink(linkId);
}
@@ -175,6 +184,4 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
final PageClassRegistryAccessor pcra = (PageClassRegistryAccessor) getApplication();
return pcra.getPageClassRegistry();
}
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index b7cf9dd..bff6a9c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -104,6 +104,18 @@ $(function() {
Isis.copyModalShown = false;
}
});
+
+ /**
+ * Show/Hide the copy link only when hovering the entity icon and title
+ */
+ $('.entityIconTitleAndCopylink').hover(
+ function() {
+ $('.copyLink').css({opacity: 1});
+ },
+ function() {
+ $('.copyLink').css({opacity: 0});
+ }
+ );
});
/**