ISIS-537: moved markup and CSS for LinksSelectorPanelAbstract into its subclasses (CollectionContentsLinkSelectorPanel and EntityLinksSelectorPanel).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3b80b5e3 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3b80b5e3 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3b80b5e3 Branch: refs/heads/master Commit: 3b80b5e374c0ebf617ad72fa0f1ac9f7efac4688 Parents: 27545b0 Author: Dan Haywood <[email protected]> Authored: Sun Nov 9 11:37:24 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Mon Nov 10 10:21:34 2014 +0000 ---------------------------------------------------------------------- .../CollectionContentsLinksSelectorPanel.css | 39 ++++++++++++++++++ .../CollectionContentsLinksSelectorPanel.html | 42 +++++++++++++++----- .../selector/links/EntityLinksSelectorPanel.css | 37 +++++++++++++++++ .../links/EntityLinksSelectorPanel.html | 42 +++++++++++++++----- .../links/LinksSelectorPanelAbstract.css | 37 ----------------- 5 files changed, 138 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/3b80b5e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.css index 084d9ca..8c3902e 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.css @@ -16,6 +16,45 @@ * specific language governing permissions and limitations * under the License. */ +.linksSelectorPanel .viewLinks { + float:right; + display:block; +} + +.linksSelectorPanel ul.dropdown-menu { + min-width: 0; +} + +.linksSelectorPanel ul.dropdown-menu li.viewItem { + min-width: 0; +} + +.linksSelectorPanel ul.viewList li.viewItem:first-child span { + border-radius:4px 0 0 4px; + -moz-border-radius:4px 0 0 4px; + -webkit-border-radius:4px 0 0 4px; +} + +.linksSelectorPanel ul.viewList li.viewItem:last-child span { + border-radius:0 4px 4px 0; + -moz-border-radius:0 4px 4px 0; + -webkit-border-radius:0 4px 4px 0; +} + + +.linksSelectorPanel .link-selector-panel-invisible { + display:none; +} + +.linksSelectorPanel .list-inline { + margin-left: 0; +} + +.linksSelectorPanel .list-inline li { + padding-left: 0; +} + + .collectionContentsLinksSelectorPanel select { margin-bottom: 1em; } http://git-wip-us.apache.org/repos/asf/isis/blob/3b80b5e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html index 22a440b..d35d523 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanel.html @@ -7,9 +7,9 @@ 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 @@ -17,12 +17,31 @@ specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; - xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"; - xml:lang="en" - lang="en"> - <body> - <wicket:extend> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> +<html xmlns:wicket="http://wicket.apache.org";> +<body> +<wicket:panel> + <div class="linksSelectorPanel"> + <div class="btn-group viewLinks" wicket:id="views"> + <button type="button" class="btn btn-xs btn-info"> + <span wicket:id="viewButtonIcon" class="ViewLinkItem"></span> + <span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span> + </button> + <button type="button" class="btn btn-xs btn-info dropdown-toggle" data-toggle="dropdown"> + <span class="caret"></span> + </button> + <ul wicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu"> + <li wicket:id="viewItem" class="viewItem"> + <a href="#" wicket:id="viewLink"> + <span wicket:id="viewItemIcon" class="ViewLinkItem"></span> <span wicket:id="viewItemTitle" class="ViewLinkItemTitle">[link title]</span> + </a> + </li> + </ul> + </div> + + <span wicket:id="additionalLinks"></span> + + <div class="views"> <div wicket:id="collectionContents-0" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> <div wicket:id="collectionContents-1" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> <div wicket:id="collectionContents-2" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> @@ -33,7 +52,8 @@ <div wicket:id="collectionContents-7" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> <div wicket:id="collectionContents-8" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> <div wicket:id="collectionContents-9" class="collectionContentsLinksSelectorPanel collectionContentsComponentType"></div> - </wicket:extend> - </body> + </div> + </div> +</wicket:panel> +</body> </html> - http://git-wip-us.apache.org/repos/asf/isis/blob/3b80b5e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css index eaeea17..6f7be55 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css @@ -16,3 +16,40 @@ * specific language governing permissions and limitations * under the License. */ +.linksSelectorPanel .viewLinks { + float:right; + display:block; +} + +.linksSelectorPanel ul.dropdown-menu { + min-width: 0; +} + +.linksSelectorPanel ul.dropdown-menu li.viewItem { + min-width: 0; +} + +.linksSelectorPanel ul.viewList li.viewItem:first-child span { + border-radius:4px 0 0 4px; + -moz-border-radius:4px 0 0 4px; + -webkit-border-radius:4px 0 0 4px; +} + +.linksSelectorPanel ul.viewList li.viewItem:last-child span { + border-radius:0 4px 4px 0; + -moz-border-radius:0 4px 4px 0; + -webkit-border-radius:0 4px 4px 0; +} + + +.linksSelectorPanel .link-selector-panel-invisible { + display:none; +} + +.linksSelectorPanel .list-inline { + margin-left: 0; +} + +.linksSelectorPanel .list-inline li { + padding-left: 0; +} http://git-wip-us.apache.org/repos/asf/isis/blob/3b80b5e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html index a1c9e5d..988f0a3 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html @@ -7,9 +7,9 @@ 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 @@ -17,12 +17,31 @@ specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; - xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"; - xml:lang="en" - lang="en"> - <body> - <wicket:extend> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> +<html xmlns:wicket="http://wicket.apache.org";> +<body> +<wicket:panel> + <div class="linksSelectorPanel"> + <div class="btn-group viewLinks" wicket:id="views"> + <button type="button" class="btn btn-xs btn-info"> + <span wicket:id="viewButtonIcon" class="ViewLinkItem"></span> + <span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span> + </button> + <button type="button" class="btn btn-xs btn-info dropdown-toggle" data-toggle="dropdown"> + <span class="caret"></span> + </button> + <ul wicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu"> + <li wicket:id="viewItem" class="viewItem"> + <a href="#" wicket:id="viewLink"> + <span wicket:id="viewItemIcon" class="ViewLinkItem"></span> <span wicket:id="viewItemTitle" class="ViewLinkItemTitle">[link title]</span> + </a> + </li> + </ul> + </div> + + <span wicket:id="additionalLinks"></span> + + <div class="views"> <div wicket:id="entity-0" class="entityLinksSelectorPanel entityComponentType"></div> <div wicket:id="entity-1" class="entityLinksSelectorPanel entityComponentType"></div> <div wicket:id="entity-2" class="entityLinksSelectorPanel entityComponentType"></div> @@ -33,7 +52,8 @@ <div wicket:id="entity-7" class="entityLinksSelectorPanel entityComponentType"></div> <div wicket:id="entity-8" class="entityLinksSelectorPanel entityComponentType"></div> <div wicket:id="entity-9" class="entityLinksSelectorPanel entityComponentType"></div> - </wicket:extend> - </body> + </div> + </div> +</wicket:panel> +</body> </html> - http://git-wip-us.apache.org/repos/asf/isis/blob/3b80b5e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css index 335e510..9f1612a 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css @@ -17,40 +17,3 @@ * under the License. */ -.linksSelectorPanel .viewLinks { - float:right; - display:block; -} - -.linksSelectorPanel ul.dropdown-menu { - min-width: 0; -} - -.linksSelectorPanel ul.dropdown-menu li.viewItem { - min-width: 0; -} - -.linksSelectorPanel ul.viewList li.viewItem:first-child span { - border-radius:4px 0 0 4px; - -moz-border-radius:4px 0 0 4px; - -webkit-border-radius:4px 0 0 4px; -} - -.linksSelectorPanel ul.viewList li.viewItem:last-child span { - border-radius:0 4px 4px 0; - -moz-border-radius:0 4px 4px 0; - -webkit-border-radius:0 4px 4px 0; -} - - -.linksSelectorPanel .link-selector-panel-invisible { - display:none; -} - -.linksSelectorPanel .list-inline { - margin-left: 0; -} - -.linksSelectorPanel .list-inline li { - padding-left: 0; -}
