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 2012/11/21 01:20:14 UTC
svn commit: r1411951 - in /isis/trunk/framework/viewer/wicket:
wicket-tck/src/main/java/viewer/wicket/app/
wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/
wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/com...
Author: danhaywood
Date: Wed Nov 21 00:20:12 2012
New Revision: 1411951
URL: http://svn.apache.org/viewvc?rev=1411951&view=rev
Log:
ISIS-232: applied Clayton's patches (doesn't look complete, though)
Modified:
isis/trunk/framework/viewer/wicket/wicket-tck/src/main/java/viewer/wicket/app/application.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
Modified: isis/trunk/framework/viewer/wicket/wicket-tck/src/main/java/viewer/wicket/app/application.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-tck/src/main/java/viewer/wicket/app/application.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-tck/src/main/java/viewer/wicket/app/application.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-tck/src/main/java/viewer/wicket/app/application.css Wed Nov 21 00:20:12 2012
@@ -28,3 +28,4 @@ div.entitySummary > label.entityTitle {
color: maroon;
font-weight: bolder;
}
+
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css Wed Nov 21 00:20:12 2012
@@ -18,15 +18,39 @@
*/
.bookmarkedPagesPanel {
- font-size: smaller;
+ font-size: 0.9em;
+ text-transform:uppercase;
+ font-weight:bold;
+ float:left;
+ width:100%;
+ margin-bottom:10px;
}
.bookmarkedPagesPanel .bookmarkedPagesList {
display: inline;
}
-.bookmarkedPagesPanel .bookmarkedPagesList span {
+.bookmarkedPagesPanel .bookmarkedPagesList span.bookmarkedPageTitle {
margin-right: 10px;
+ margin-bottom:10px;
+ float:left;
+ display:block;
+ padding:8px;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ background-color:#FFFFFF;
+ color:#46413B;
+ font-style:normal !important;
+}
+
+.bookmarkedPagesPanel .bookmarkedPagesList a span.bookmarkedPageTitle {
+ background-color:#F0EFEA;
+}
+
+.bookmarkedPagesPanel .bookmarkedPagesList a:hover span.bookmarkedPageTitle {
+ background-color:#FFFFFF;
+ text-decoration:none;
}
.bookmarkedPagesPanel .bookmarkedPageItem {
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html Wed Nov 21 00:20:12 2012
@@ -27,10 +27,10 @@
<div id="bookmarkedPages" class="bookmarkedPagesPanel bookmarkedPagesComponentType">
<ul wicket:id="bookmarkList" class="bookmarkedPagesList">
<li wicket:id="bookmarkedPageItem" class="bookmarkedPageItem">
- <a href="#" wicket:id="bookmarkedPageLink"><span wicket:id="bookmarkedPageTitle">[link title]</span></a>
+ <a href="#" wicket:id="bookmarkedPageLink"><span wicket:id="bookmarkedPageTitle" class="bookmarkedPageTitle">[link title]</span></a>
</li>
</ul>
- <a href="#" wicket:id="clearBookmarks" class="clearBookmarks">clear</a>
+ <a href="#" wicket:id="clearBookmarks" class="clearBookmarks" title="Clear Bookmarks">clear</a>
</div>
</wicket:panel>
</body>
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html Wed Nov 21 00:20:12 2012
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<div class="entityCollectionsPanel entityCollectionsComponentType">
- <div wicket:id="collections">
+ <div wicket:id="collections" class="myBlockContainer">
<fieldset wicket:id="collectionGroup" class="memberGroup">
<legend wicket:id="collectionName">[collection name]</legend>
<div wicket:id="collection" class="collection">
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css Wed Nov 21 00:20:12 2012
@@ -17,6 +17,7 @@
* under the License.
*/
.entityHeaderPanel {
+ clear:both;
}
div.entityHeaderPanel .iconAndTitle {
@@ -35,9 +36,10 @@ div.entityHeaderPanel .actions {
.entityHeaderPanel .entityImage {
width: 32px;
height: 32px;
+ vertical-align:text-bottom;
+ padding-right:5px;
}
.entityHeaderPanel .entityTitle {
font-size: x-large;
}
-
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css Wed Nov 21 00:20:12 2012
@@ -17,9 +17,9 @@
* under the License.
*/
.entityPropertiesPanel fieldset {
- border: 1px solid threedshadow;
+ margin:0px;
+ padding:0px;
}
.entityPropertiesPanel fieldset legend {
- margin-left: 10px;
}
\ No newline at end of file
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html Wed Nov 21 00:20:12 2012
@@ -20,7 +20,7 @@
<html>
<body>
<wicket:panel>
- <div class="entityPropertiesPanel entityPropertiesComponentType">
+ <div class="entityPropertiesPanel entityPropertiesComponentType myBlockContainer">
<form wicket:id="entityProperties" class="inputForm">
<div class="inputFormTable properties">
<fieldset wicket:id="memberGroup" class="memberGroup">
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css Wed Nov 21 00:20:12 2012
@@ -19,210 +19,246 @@
.cssMenuPanel span.clear {
line-height: 3px;
}
-
-.cssMenuPanel .menuh
- {
+
+.cssMenuPanel .menuh {
font-family: arial, helvetica, sans-serif;
- float:left;
+ float: left;
margin-top: 0.1em;
background: repeat-x scroll center center;
- width:100%;
+ width: 100%;
}
.cssMenuPanel .menuh .small {
- float:none;
+ float: none;
display: inline;
}
.cssMenuPanel .menuh p .small {
- float:none;
+ float: none;
display: inline;
}
-.menuh a, .menuh p {
+.menuh a,.menuh p {
text-align: left;
- display:block;
- border: 1px #00477F solid;
- white-space:nowrap;
- margin:0em;
+ display: block;
+ border: 1px #00477F solid;
+ white-space: nowrap;
+ margin: 0em;
padding: 1px;
padding-right: 1.6em;
padding-left: 0.4em;
font-weight: normal;
- cursor:default;
+ cursor: default;
}
-
-.cssMenuPanel .menuh a:link,
-.cssMenuPanel .menuh a:visited,
-.cssMenuPanel .menuh a:active,
-.cssMenuPanel .menuh p {
+
+.cssMenuPanel .menuh a:link,.cssMenuPanel .menuh a:visited,.cssMenuPanel .menuh a:active,.cssMenuPanel .menuh p
+ {
color: #00477F;
background-color: #EEEEEE;
- text-decoration:none;
+ text-decoration: none;
}
-
-.cssMenuPanel .menuh a:hover,
-.cssMenuPanel .menuh p:hover {
+
+.cssMenuPanel .menuh a:hover,.cssMenuPanel .menuh p:hover {
color: #D7E7F5;
background-color: #407098;
}
.cssMenuPanel .menuh a:hover {
- text-decoration:underline;
-}
+ text-decoration: underline;
+}
-.cssMenuPanel .menuh a.top-parent,
-.cssMenuPanel .menuh p.top-parent {
+.cssMenuPanel .menuh a.top-parent,.cssMenuPanel .menuh p.top-parent {
background-image: url(navdown_secondarydark.gif);
background-position: right center;
background-repeat: no-repeat;
- }
+}
-.cssMenuPanel .menuh a.top-parent:hover,
-.cssMenuPanel .menuh p.top-parent:hover {
+.cssMenuPanel .menuh a.top-parent:hover,.cssMenuPanel .menuh p.top-parent:hover
+ {
background-image: url(navdown_primarypale.gif);
background-position: right center;
background-repeat: no-repeat;
}
-.cssMenuPanel .menuh a.parent,
-.cssMenuPanel .menuh p.parent {
+.cssMenuPanel .menuh a.parent,.cssMenuPanel .menuh p.parent {
background-image: url(nav_secondarydark.gif);
background-position: right center;
background-repeat: no-repeat;
}
-.cssMenuPanel .menuh a.parent:hover,
-.cssMenuPanel .menuh p.parent:hover {
+.cssMenuPanel .menuh a.parent:hover,.cssMenuPanel .menuh p.parent:hover
+ {
background-image: url(nav_primarypale.gif);
background-position: right center;
background-repeat: no-repeat;
}
.cssMenuPanel .menuh ul {
- list-style:none;
- margin:0;
- padding:0;
- float:left;
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ float: left;
display: inline;
}
.cssMenuPanel .menuh li {
- position:relative;
+ position: relative;
min-height: 1px;
- }
+}
.cssMenuPanel .menuh ul ul {
- position:absolute;
- z-index:500;
- top:auto;
- display:none;
+ position: absolute;
+ z-index: 500;
+ top: auto;
+ display: none;
padding: 1em;
- margin:-1em 0 0 -1em;
+ margin: -1em 0 0 -1em;
}
.cssMenuPanel .menuh ul ul ul {
- top:0;
- left:100%;
+ top: 0;
+ left: 100%;
}
.cssMenuPanel span.menuh a:hover {
- cursor:pointer;
- z-index:100;
+ cursor: pointer;
+ z-index: 100;
}
-.cssMenuPanel span.menuh li:hover ul ul,
-.cssMenuPanel span.menuh li li:hover ul ul,
-.cssMenuPanel span.menuh li li li:hover ul ul,
-.cssMenuPanel span.menuh li li li li:hover ul ul {
- display:none;
+.cssMenuPanel span.menuh li:hover ul ul,.cssMenuPanel span.menuh li li:hover ul ul,.cssMenuPanel span.menuh li li li:hover ul ul,.cssMenuPanel span.menuh li li li li:hover ul ul
+ {
+ display: none;
}
-.cssMenuPanel span.menuh li:hover ul,
-.cssMenuPanel span.menuh li li:hover ul,
-.cssMenuPanel span.menuh li li li:hover ul,
-.cssMenuPanel span.menuh li li li li:hover ul {
- display:block;
+.cssMenuPanel span.menuh li:hover ul,.cssMenuPanel span.menuh li li:hover ul,.cssMenuPanel span.menuh li li li:hover ul,.cssMenuPanel span.menuh li li li li:hover ul
+ {
+ display: block;
}
-
.cssMenuPanel li.cssSubMenuItem p.disabled {
color: gray;
}
-
-
-
/******** overrides for grouped actions and entity actions ***************/
+.groupedActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
+ display: none;
+}
-.groupedActions .cssMenuPanel li.cssMenuItemPanel > p.top-parent {
- display:none;
+.groupedActions .cssMenuPanel .menuh ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0px;
+ padding: 0px;
}
.groupedActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: inline-block;
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0px;
+ padding: 0px;
}
-
.groupedActions .cssMenuPanel .menuh li,
-.groupedActions .cssMenuPanel .menuh li p {
- display: inline;
+.groupedActions .cssMenuPanel .menuh li p {
+ float:left;
+ display:block;
+ margin-left:10px;
}
-.groupedActions .cssMenuPanel .menuh a,
-.groupedActions .cssMenuPanel .menuh p {
- display: inline-block;
- border: none;
+.groupedActions .cssMenuPanel .menuh a,.groupedActions .cssMenuPanel .menuh p
+ {
+ display: inline-block;
+ border: none;
}
.groupedActions .cssMenuPanel .menuh a:link,
.groupedActions .cssMenuPanel .menuh a:visited,
.groupedActions .cssMenuPanel .menuh a:active,
-.groupedActions .cssMenuPanel .menuh p {
- background-color: #fff;
+.groupedActions .cssMenuPanel .menuh p
+ {
+ background-color: #F0EFEA;
+ color: #46423C;
+ display: block;
+ float: left;
+ height: 30px;
+ line-height: 30px;
+ padding:0px 10px;
+ font-weight:bold;
+ text-transform:uppercase;
+ font-size:0.85em;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ text-decoration:none;
}
-.groupedActions .cssMenuPanel .menuh a:hover,
-.groupedActions .cssMenuPanel .menuh p:hover {
+.groupedActions .cssMenuPanel .menuh a:hover,.groupedActions .cssMenuPanel .menuh p:hover
+ {
color: #000;
-}
-
+ background-color:#FFFFFF;
+}
+.entityActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
+ display: none;
+}
-.entityActions .cssMenuPanel li.cssMenuItemPanel > p.top-parent {
- display:none;
+.entityActions .cssMenuPanel .menuh ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0px 0px 10px;
+ padding: 0px;
}
.entityActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: inline-block;
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0px;
+ padding: 0px;
}
-
.entityActions .cssMenuPanel .menuh li,
.entityActions .cssMenuPanel .menuh li p {
- display: inline;
+ float:left;
+ display:block;
+ margin-left:10px;
}
.entityActions .cssMenuPanel .menuh a,
.entityActions .cssMenuPanel .menuh p {
- display: inline-block;
- border: none;
+ display: inline-block;
+ border: none;
}
.entityActions .cssMenuPanel .menuh a:link,
.entityActions .cssMenuPanel .menuh a:visited,
.entityActions .cssMenuPanel .menuh a:active,
.entityActions .cssMenuPanel .menuh p {
- background-color: #fff;
+ background-color: #F0EFEA;
+ color: #46423C;
+ display: block;
+ float: left;
+ height: 30px;
+ line-height: 30px;
+ padding:0px 10px;
+ font-weight:bold;
+ text-transform:uppercase;
+ font-size:0.85em;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ text-decoration:none;
}
.entityActions .cssMenuPanel .menuh a:focus {
text-decoration: underline;
}
-.entityActions .cssMenuPanel .menuh a:hover,
-.entityActions .cssMenuPanel .menuh p:hover {
+.entityActions .cssMenuPanel .menuh a:hover,.entityActions .cssMenuPanel .menuh p:hover
+ {
color: #000;
-}
+ background-color:#FFFFFF;
+}
\ No newline at end of file
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html Wed Nov 21 00:20:12 2012
@@ -26,7 +26,6 @@
<span wicket:id="menuItem">[menuItem here]</span>
</ul>
</span>
- <span class="clear"> </span>
</span>
</wicket:panel>
</body>
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Wed Nov 21 00:20:12 2012
@@ -39,22 +39,56 @@
}
.links {
- padding-top: 4px;
- padding-bottom: 4px;
clear: both;
- width: 100%;
- height: 30px;
+ height: 60px;
+ line-height:60px;
+ color:#20B5C2;
+ text-transform: uppercase;
+ font-size:1.0em;
+ font-weight:bold;
+ padding:0px 20px 0px 0px;
}
+ .links a {
+ color:#FFFFFF;
+ font-weight:bold;
+ }
+
+
#container {
- margin-left: auto;
- margin-right: auto;
- background-color: white;
- padding: 4px 4px 4px 4px;
/*width: 800px;*/
}
+/* Buttons */
+
+.edit,
+.ok,
+.okButton {
+ display:inline-block;
+ background-color:#20B5C2;
+ color:#FFFFFF;
+ text-transform:uppercase;
+ font-size:0.9em;
+ border:0px;
+ padding:5px 10px;
+ border-radius:4px;
+ cursor:pointer;
+}
+
+.cancel {
+ display:inline-block;
+ background-color:#E4E4DB;
+ color:#46423C;
+ text-transform:uppercase;
+ font-size:0.9em;
+ border:0px;
+ padding:5px 10px;
+ border-radius:4px;
+ cursor:pointer;
+}
+
+
/********** CLASSes **********/
.clear {
@@ -78,22 +112,124 @@
/**************** APPLICATION MENU **************/
+#applicationActions {
+ padding-left: 10px;
+ height:40px;
+}
+
#applicationActions .menuh {
- background-color: #EEEEEE;
+ background-color: transparent;
+ position:relative;
+ z-index:501;
}
+ #applicationActions .menuh ul.cssMenuItems {
+ line-height:30px;
+ }
+
+ #applicationActions .cssMenuPanel .menuh a:link,
+ #applicationActions .cssMenuPanel .menuh a:visited,
+ #applicationActions .cssMenuPanel .menuh a:active,
+ #applicationActions .cssMenuPanel .menuh p {
+ background-color: transparent;
+ color: #FFFFFF;
+ text-decoration: none;
+ text-transform:uppercase;
+ font-size:0.9em;
+ font-weight:bold;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li a:link,
+ #applicationActions .cssMenuPanel .menuh li a:visited,
+ #applicationActions .cssMenuPanel .menuh li a:active,
+ #applicationActions .cssMenuPanel .menuh li p {
+ border-radius:4px 4px 0px 0px;
+ -moz-border-radius:4px 4px 0px 0px;
+ -webkit-border-radius:4px 4px 0px 0px;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li li a:link,
+ #applicationActions .cssMenuPanel .menuh li li a:visited,
+ #applicationActions .cssMenuPanel .menuh li li a:active,
+ #applicationActions .cssMenuPanel .menuh li li p {
+ border-radius:0px;
+ -moz-border-radius:0px;
+ -webkit-border-radius:0px;
+ background-color: #20B5C2;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li li:last-child a:link,
+ #applicationActions .cssMenuPanel .menuh li li:last-child a:visited,
+ #applicationActions .cssMenuPanel .menuh li li:last-child a:active,
+ #applicationActions .cssMenuPanel .menuh li li:last-child p {
+ border-radius:0px 0px 4px 4px;
+ -webkit-border-radius:0px 0px 4px 4px;
+ -moz-border-radius:0px 0px 4px 4px;
+ background-color: #20B5C2;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li li:first-child a:link,
+ #applicationActions .cssMenuPanel .menuh li li:first-child a:visited,
+ #applicationActions .cssMenuPanel .menuh li li:first-child a:active,
+ #applicationActions .cssMenuPanel .menuh li li:first-child p {
+ border-radius:0px 4px 0px 0px;
+ -webkit-border-radius:0px 4px 0px 0px;
+ -moz-border-radius:0px 4px 0px 0px;
+ background-color: #20B5C2;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:link,
+ #applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:visited,
+ #applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:active,
+ #applicationActions .cssMenuPanel .menuh li li:first-child:last-child p {
+ border-radius:0px 4px 4px 4px;
+ -webkit-border-radius:0px 4px 4px 4px;
+ -moz-border-radius:0px 4px 4px 4px;
+ background-color: #20B5C2;
+ }
+
+
+ #applicationActions .menuh a,
+ #applicationActions .menuh p {
+ border: 0px solid #00477F;
+ padding: 0px 1em 0px 1em;
+ background-image:none !important;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li:hover a,
+ #applicationActions .cssMenuPanel .menuh li:hover p {
+ color: #FFFFFF;
+ background-color: #20B5C2;
+ }
+
+ #applicationActions .cssMenuPanel .menuh a:hover,
+ #applicationActions .cssMenuPanel .menuh p:hover {
+ color: #FFFFFF;
+ background-color: #20B5C2;
+ }
+
+ #applicationActions .cssMenuPanel .menuh li li a:hover,
+ #applicationActions .cssMenuPanel .menuh li li p:hover {
+ color: #FFFFFF;
+ background-color: #40C0CB !important;
+ }
+
+ #applicationActions ul.cssSubMenuItemsPanel {
+ min-width:220px;
+ }
+
+
+
/**************** ELEMENTS **************/
body {
- background-color: #EEEEEE;
- background-image: url('wicket-bg.png');
- background-repeat: repeat-x;
- color: #00477F;
- font-family: 'Tahoma', 'Lucida Sans', 'Arial', 'Helvetica', 'Sans-serif', 'sans';
- font-size: 10pt;
+ background-color: #E3E3D9;
+ color: #454545;
+ font-family: Arial,'Sans-serif', 'Helvetica', 'Sans-serif', 'sans';
+ font-size: 0.8em;
line-height: 1.4em;
- padding: 0px 10px 10px 10px;
- margin: 10px 10px 10px 10px;
+ padding: 0px;
+ margin:0px;
}
.panel, fieldset {
@@ -112,12 +248,25 @@ div {
#body {
min-height: 400px;
+ margin:20px;
}
#footer {
- background-color: #EEEEEE;
}
+ #footer .links {
+ height:auto;
+ padding:0px 20px;
+ line-height:20px;
+ height:20px;
+ color:#46423C;
+ }
+
+ #footer .links a {
+ color:#20B5C2;
+ text-decoration:none;
+ }
+
h3 {
margin-top: 9px;
margin-bottom: 0px;
@@ -132,6 +281,32 @@ form fieldset .okButton {
margin-top: 2em;
}
+.myBlockContainer {
+ background-color:#FFFFFF;
+ padding:20px;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ margin-bottom:1%;
+ position:relative;
+}
+
+.myBlockContainer fieldset {
+ border:0px;
+ margin:0px;
+ padding:0px;
+}
+
+.myBlockContainer legend {
+ color:#423D37;
+ font-size:1.6em;
+ margin-bottom:10px;
+ line-height:120%;
+ padding:0px;
+ float:left;
+ display:block;
+}
+
/************************************************************ *********/
@@ -144,13 +319,12 @@ h1,h2,h3,h4,h5,h6,h7,h8 {
h1,h2 {
letter-spacing: -1px;
- font-family: 'Trebuchet MS';
}
#extitle {
font-size: 12pt;
font-weight: bold;
- color: #00477F;
+ color: #454545;
padding: 10px 10px 10px 10px;
}
@@ -252,9 +426,8 @@ tr.section td {
/*************** Styling Entity Forms and Parameters ********************/
+
.even, .odd {
- margin-left: 1em;
- margin-right: 1em;
background-color: #ffffff;
}
@@ -263,15 +436,33 @@ tr.section td {
clear: both;
}
-.scalarName, .collectionName, .scalarValue, .collectionContents {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
+.scalarNameAndValueComponentType {
+}
+
+.scalarName {
+ padding:6px 0px;
+ margin-bottom:5px;
+}
+
+
+
+.scalarValue {
+ margin-bottom:10px;
+}
+
+.collectionName,
+.collectionContents {
+
}
.scalarName, .collectionName {
float: left;
- font-style: italic;
- text-align: right;
+ font-style: normal;
+ text-align: left;
+ text-transform:uppercase;
+ font-weight:bold !important;
+ font-size:0.9em;
+ color:#46413B;
}
.scalarName:after, .collectionName:after {
@@ -284,12 +475,10 @@ tr.section td {
}
.scalarValue {
- padding-left: 0.5em;
}
.collectionContents {
- padding-left: 1em;
- width: 99%;
+ width: 100%;
}
.scalarName {
@@ -308,7 +497,7 @@ div.scalarPanel {
}
.buttons {
- padding: 1em;
+ padding: 1em 0em 0em;
clear: both;
display: block;
}
@@ -332,19 +521,22 @@ div.scalarPanel {
.actionPage .select2-container .select2-choice,
.entityPage .select2-container .select2-choice {
- padding: 0 0 0 0px;
+ padding: 4px;
}
.actionPage .select2-container .select2-choice,
.entityPage .select2-container .select2-choice {
- -webkit-border-radius: 0px;
- -moz-border-radius: 0px;
- border-radius: 0px;
-
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
height: 20px;
line-height: 20px;
-
+ font-size:11px;
+ color:#7F7F7F;
+ background:#FFFFFF none;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
}
.actionPage .select2-container.select2-drop-above .select2-choice,
@@ -378,11 +570,35 @@ div.scalarPanel {
.actionPage .select2-container.select2-container-disabled .select2-choice,
.entityPage .select2-container.select2-container-disabled .select2-choice {
- background-color: #EBEBE4;
- border: 1px solid #AAA;
+ background-color:#F0EFEA;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
}
.actionPage .select2-container a,
.entityPage .select2-container a {
font-weight: normal;
}
+
+
+/******** FORM STYLES ********/
+
+form input[type=text][disabled] {
+ border-radius:4px;
+ -moz-borer-radius:4px;
+ -webkit-border-radius:4px;
+ padding:6px;
+ background-color:#F0EFEA;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+form input[type=text] {
+ border-radius:4px;
+ -moz-borer-radius:4px;
+ -webkit-border-radius:4px;
+ padding:6px;
+ background-color:#FFFFFF;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
\ No newline at end of file
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html Wed Nov 21 00:20:12 2012
@@ -31,11 +31,13 @@
</head>
<body>
<div id="container" class="wicketSignInPanel">
- <div id="header">
- <h1><span wicket:id="applicationName">[application name]</span></h1>
+ <div class="headerContainer">
+ <div id="header">
+ <h1><span wicket:id="applicationName">[application name]</span></h1>
+ </div>
+ <div class="clear"/>
</div>
- <div class="clear"/>
- <h2>Sign In</h2>
+ <h2>Member Login</h2>
<p>
<span wicket:id="signInPanel"/>
</div>
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css Wed Nov 21 00:20:12 2012
@@ -17,19 +17,56 @@
* under the License.
*/
-.linksSelectorPanel .viewList {
- font-size: smaller;
+.linksSelectorPanel ul.viewList {
+ float:right;
+ display:block;
}
-.linksSelectorPanel .viewList {
- display: inline;
+.linksSelectorPanel ul.viewList span {
}
-.linksSelectorPanel .viewList span {
- margin-right: 8px;
+.linksSelectorPanel ul.viewList li.viewItem {
+ float:left;
+ display:block;
+ height:30px;
+ line-height:30px;
+ position:relative;
}
-.linksSelectorPanel .viewItem {
- display: inline;
+.linksSelectorPanel ul.viewList li.viewItem:first-child span {
+ border-radius:4px 0px 0px 4px;
+ -moz-border-radius:4px 0px 0px 4px;
+ -webkit-border-radius:4px 0px 0px 4px;
}
+.linksSelectorPanel ul.viewList li.viewItem:last-child span {
+ border-radius:0px 4px 4px 0px;
+ -moz-border-radius:0px 4px 4px 0px;
+ -webkit-border-radius:0px 4px 4px 0px;
+}
+
+a span.ViewLinkItem {
+ color:#46423C;
+ background-color:#F0EFEA;
+ float:left;
+ display:block;
+ height:30px;
+ line-height:30px;
+}
+
+span.ViewLinkItem {
+ color:#FFFFFF;
+ background-color:#20B5C2;
+ float:left;
+ display:block;
+ height:30px;
+ line-height:30px;
+ font-style:normal;
+}
+
+.ViewLinkItem {
+ padding:0px 10px;
+ font-weight:bold;
+ text-transform:uppercase;
+ font-size:0.85em;
+}
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html?rev=1411951&r1=1411950&r2=1411951&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html Wed Nov 21 00:20:12 2012
@@ -26,10 +26,11 @@
<ul wicket:id="viewList" class="viewList">
<li wicket:id="viewItem" class="viewItem">
<a href="#" wicket:id="viewLink">
- <span wicket:id="viewTitle">[link title]</span>
+ <span wicket:id="viewTitle" class="ViewLinkItem">[link title]</span>
</a>
</li>
</ul>
+ <br class="clear"/>
</p>
<div class="views">
<wicket:child/>